adt-run: Some notes about our interaction with pbuilder

diff --git a/TODO b/TODO
index ee475ed51837710dfe1e82c551343b71535f280c..82b97811d00d84df5075138df340f87204e85046 100644 (file)
--- 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 6bd2a21811de74bc74e9a28d0dc6058d7965480e..4d2ae5b57e5dee679e42256af1533172e30f4ee7 100755 (executable)
--- 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)