From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 28 Jul 2011 09:44:33 +0000 (+0100)
Subject: adt-run: Some notes about our interaction with pbuilder
X-Git-Tag: debian/2.0.0~30
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ea3caa4e7b806dcf7e11f7304647cf07b87358b2;p=autopkgtest.git

adt-run: Some notes about our interaction with pbuilder
---

diff --git a/TODO b/TODO
index ee475ed..82b9781 100644
--- a/TODO
+++ b/TODO
@@ -6,11 +6,6 @@ not needed for demo:
     ./adt-run --tmp-dir=`pwd`/d -d --no-built-binaries --binaries=auto --binary ../../Mawk/mawk_1.3.3-11ubuntu2_i386.deb ../../Mawk/ancient/mawk_1.3.3-11ubuntu2.dsc --- ../virt-subproc/adt-virt-schroot wheezy-snap
   but it seemed to do install of old mawk before build
 
-- file bugs against pbuilder-satisfydepends
-    * uses "/usr/bin/apt-get"
-    * --internal-chrootexec should be exposed
-    * .dsc parsing bug (last line ignored)
-
 - remove dependency on python in testbed
 
 - Nightmare shell quoting situation:
diff --git a/runner/adt-run b/runner/adt-run
index 6bd2a21..4d2ae5b 100755
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -954,7 +954,7 @@ exec '''+shellquote_cmdl(tb.ec_cmdl)+' "$*"'+"\n"
 	dsc = TemporaryFile('deps.dsc')
 	print >>open(dsc.write(),'w'), 'Build-Depends: ', deps, '\n\n'
 	# pbuilder-satisfydepends has a bug where it ignores the
-	#  Build-Depends if it's the last line in the dsc
+	#  Build-Depends if it's the last line in the dsc (#635696)
 	tb.satisfy_dependencies_dsc(dsc, what)
 
  def satisfy_dependencies_dsc(tb, dsc, what):
@@ -964,6 +964,8 @@ exec '''+shellquote_cmdl(tb.ec_cmdl)+' "$*"'+"\n"
 		'--internal-chrootexec',tb.ec_auxverbscript.read(),
 		'-c',dsc.read()
 	]
+	# The --internal-chrootexec option is really handy but
+	#  perhaps we are not supposed to use it ?  See also #635697.
 	debug('dependencies: %s: running %s' % (what,`cmdl`))
 	rc = subprocess.call(cmdl, stdout=None, stderr=None)
 	if rc: badpkg('dependency install failed, exit code %d' % rc)