* Show all apt stdout (including dpkg stdout) in contemporaneous trace.

diff --git a/debian/changelog b/debian/changelog
index 65f8685cdc796876957495ba5fd2bf3b2d2c91dd..e7e7e2b61a14cb2d3f0d81dacc937598ac268a9e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ autopkgtest (0.7.2~~iwj) unstable; urgency=low
   * Run sendmail -odi not -odq in adt-testreport-onepackage.
   * Longer timeouts by default.
   * Print `adt-run: trace' for trace output.
+  * Show all apt stdout (including dpkg stdout) in contemporaneous trace.
   
  --
 

diff --git a/runner/adt-run b/runner/adt-run
index 34b22614a68252cc9d6c870d858849699649506d..573fd068ffe7dc318f814e6e4d52b5534696777f 100755 (executable)
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -737,7 +737,7 @@ class Testbed:
  def reset_apt(tb):
        if not tb._need_reset_apt: return
        what = 'aptget-update-reset'
-       cmdl = ['apt-get','-qy','update']
+       cmdl = ['sh','-c','apt-get -qy update 2>&1']
        rc = tb.execute(what, cmdl, kind='install')
        if rc:
                pstderr("\n" "warning: failed to restore"
@@ -1330,7 +1330,7 @@ END
        ag = ['apt-get','-qy']
        for kv in b.apt_configs().iteritems():
                ag += ['-o', '%s=%s' % kv]
-       return ag
+       return ' '.join(ag)
 
  def reset(b):
        b._debug('reset')
@@ -1395,7 +1395,7 @@ END
   if [ "x`ls /var/lib/dpkg/updates`" != x ]; then
     echo >&2 "/var/lib/dpkg/updates contains some files, aargh"; exit 1
   fi
-  '''+ ' '.join(b.apt_get()) +''' update >&2
+  '''+ b.apt_get() +''' update >&2
   cat /var/lib/dpkg/status >&3
                '''
        testbed.mungeing_apt()
@@ -1420,8 +1420,9 @@ END
        if pkgs_reinstall:
                for pkg in pkgs_reinstall: testbed.blame(pkg)
                what = 'apt-get-reinstall'
-               cmdl = (b.apt_get() + ['--reinstall','install'] +
-                       [pkg for pkg in pkgs_reinstall])
+               cmdl = (b.apt_get() + ' --reinstall install '+
+                       ' '.join([pkg for pkg in pkgs_reinstall])+' >&2')
+               cmdl = ['sh','-c',cmdl]
                rc = testbed.execute(what, cmdl, script=None, kind='install')
                if rc: badpkg("installation of basic binarries failed,"
                                " exit code %d" % rc)
@@ -1430,7 +1431,8 @@ END
        for pkg in b.install:
                what = 'apt-get-install-%s' % pkg
                testbed.blame(pkg)
-               cmdl = b.apt_get() + ['install',pkg]
+               cmdl = b.apt_get() + ' install ' + pkg + ' >&2'
+               cmdl = ['sh','-c',cmdl]
                rc = testbed.execute(what, cmdl, script=None, kind='install')
                if rc: badpkg("installation of %s failed, exit code %d"
                                % (pkg, rc))