1 files changed, 133 insertions, 112 deletions
diff --git a/testsuite/normal/pbuilder-update-lenny-squeeze.log b/testsuite/normal/pbuilder-update-lenny-squeeze.log
index cb6375c..14bf1a2 100644
--- a/testsuite/normal/pbuilder-update-lenny-squeeze.log
+++ b/testsuite/normal/pbuilder-update-lenny-squeeze.log
@@ -1,123 +1,143 @@
-Upgrading for distribution squeeze
-Building the build Environment
- -> extracting base tarball [/TESTDIR/testimage]
- -> creating local configuration
- -> copying local configuration
-  -> Installing apt-lines
- -> mounting /proc filesystem
- -> mounting /dev/pts filesystem
- -> policy-rc.d already exists
-Refreshing the base.tgz 
- -> upgrading packages
+I: Upgrading for distribution squeeze
+I: Building the build Environment
+I: extracting base tarball [/TESTDIR/testimage]
+I: creating local configuration
+I: copying local configuration
+I: Installing apt-lines
+I: mounting /proc filesystem
+I: mounting /dev/pts filesystem
+I: policy-rc.d already exists
+I: Refreshing the base.tgz 
+I: upgrading packages
 Get:1 http://localhost squeeze Release.gpg [189B]
 Get:2 http://localhost squeeze Release [68.7kB]
 Ign http://localhost squeeze/main Packages
-Get:3 http://localhost squeeze/main Packages [7177kB]
+Get:3 http://localhost squeeze/main Packages [7175kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 Reading package lists...
 Building dependency tree...
 Reading state information...
 The following packages will be upgraded:
-  aptitude cpio cpp-4.3 debianutils g++-4.3 gcc-4.3 gcc-4.3-base libdb4.6
-  libept0 libgcc1 libgdbm3 libgomp1 libmpfr1ldbl libstdc++6 libstdc++6-4.3-dev
-  mawk mktemp sed tzdata
-19 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 18.3MB of archives.
-After this operation, 1270kB of additional disk space will be used.
+  aptitude binutils cpio cpp-4.3 debianutils g++-4.3 gcc-4.3 gcc-4.3-base grep
+  gzip libdb4.6 libept0 libgcc1 libgdbm3 libgomp1 libmpfr1ldbl libsepol1
+  libstdc++6 libstdc++6-4.3-dev mawk mktemp sed tzdata
+23 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 21.8MB of archives.
+After this operation, 1950kB of additional disk space will be used.
 Get:1 http://localhost squeeze/main debianutils 2.31 [56.0kB]
-Get:2 http://localhost squeeze/main mktemp 1.6-1 [11.8kB]
-Get:3 http://localhost squeeze/main sed 4.1.5-8 [254kB]
-Get:4 http://localhost squeeze/main mawk 1.3.3-14 [90.5kB]
-Get:5 http://localhost squeeze/main libgomp1 4.3.3-3 [15.5kB]
-Get:6 http://localhost squeeze/main gcc-4.3-base 4.3.3-3 [104kB]
-Get:7 http://localhost squeeze/main libstdc++6 4.3.3-3 [334kB]
-Get:8 http://localhost squeeze/main cpp-4.3 4.3.3-3 [3372kB]
-Get:9 http://localhost squeeze/main gcc-4.3 4.3.3-3 [2609kB]
-Get:10 http://localhost squeeze/main g++-4.3 4.3.3-3 [4801kB]
-Get:11 http://localhost squeeze/main libstdc++6-4.3-dev 4.3.3-3 [1428kB]
-Get:12 http://localhost squeeze/main libgcc1 1:4.3.3-3 [44.5kB]
-Get:13 http://localhost squeeze/main libmpfr1ldbl 2.3.2.dfsg.1-1 [360kB]
-Get:14 http://localhost squeeze/main libdb4.6 4.6.21-13 [593kB]
-Get:15 http://localhost squeeze/main tzdata 2008i-3 [746kB]
-Get:16 http://localhost squeeze/main libept0 0.5.26 [205kB]
-Get:17 http://localhost squeeze/main aptitude 0.4.11.11-1 [3068kB]
-Get:18 http://localhost squeeze/main cpio 2.9-14 [182kB]
-Get:19 http://localhost squeeze/main libgdbm3 1.8.3-4 [24.2kB]
+Get:2 http://localhost squeeze/main grep 2.5.4-2 [315kB]
+Get:3 http://localhost squeeze/main gzip 1.3.12-7 [107kB]
+Get:4 http://localhost squeeze/main mktemp 1.6-1 [11.8kB]
+Get:5 http://localhost squeeze/main sed 4.1.5-8 [254kB]
+Get:6 http://localhost squeeze/main mawk 1.3.3-14 [90.5kB]
+Get:7 http://localhost squeeze/main libgomp1 4.3.3-3 [15.5kB]
+Get:8 http://localhost squeeze/main gcc-4.3-base 4.3.3-3 [104kB]
+Get:9 http://localhost squeeze/main libstdc++6 4.3.3-3 [334kB]
+Get:10 http://localhost squeeze/main cpp-4.3 4.3.3-3 [3372kB]
+Get:11 http://localhost squeeze/main gcc-4.3 4.3.3-3 [2609kB]
+Get:12 http://localhost squeeze/main g++-4.3 4.3.3-3 [4801kB]
+Get:13 http://localhost squeeze/main libstdc++6-4.3-dev 4.3.3-3 [1428kB]
+Get:14 http://localhost squeeze/main libgcc1 1:4.3.3-3 [44.5kB]
+Get:15 http://localhost squeeze/main libmpfr1ldbl 2.3.2.dfsg.1-1 [360kB]
+Get:16 http://localhost squeeze/main binutils 2.19.1-1 [2921kB]
+Get:17 http://localhost squeeze/main libdb4.6 4.6.21-13 [593kB]
+Get:18 http://localhost squeeze/main libsepol1 2.0.32-1 [125kB]
+Get:19 http://localhost squeeze/main tzdata 2009b-1 [752kB]
+Get:20 http://localhost squeeze/main libept0 0.5.26 [205kB]
+Get:21 http://localhost squeeze/main aptitude 0.4.11.11-1 [3068kB]
+Get:22 http://localhost squeeze/main cpio 2.9-15 [182kB]
+Get:23 http://localhost squeeze/main libgdbm3 1.8.3-4 [24.2kB]
 debconf: delaying package configuration, since apt-utils is not installed
 Fetched XXXB in Xs (XXXXXB/s)
-(Reading database ... 9656 files and directories currently installed.)
-Preparing to replace debianutils 2.30 (using .../debianutils_2.31_amd64.deb) ...
-Unpacking replacement debianutils ...
-Setting up debianutils (2.31) ...
-(Reading database ... 9656 files and directories currently installed.)
-Preparing to replace mktemp 1.5-9 (using .../mktemp_1.6-1_amd64.deb) ...
-Unpacking replacement mktemp ...
-Setting up mktemp (1.6-1) ...
-(Reading database ... 9656 files and directories currently installed.)
-Preparing to replace sed 4.1.5-6 (using .../archives/sed_4.1.5-8_amd64.deb) ...
-Unpacking replacement sed ...
-Setting up sed (4.1.5-8) ...
-(Reading database ... 9656 files and directories currently installed.)
-Preparing to replace mawk 1.3.3-11.1 (using .../mawk_1.3.3-14_amd64.deb) ...
-Unpacking replacement mawk ...
-Preparing to replace libgomp1 4.3.2-1.1 (using .../libgomp1_4.3.3-3_amd64.deb) ...
-Unpacking replacement libgomp1 ...
-Preparing to replace gcc-4.3-base 4.3.2-1.1 (using .../gcc-4.3-base_4.3.3-3_amd64.deb) ...
-Unpacking replacement gcc-4.3-base ...
-Setting up gcc-4.3-base (4.3.3-3) ...
-(Reading database ... 9656 files and directories currently installed.)
-Preparing to replace libstdc++6 4.3.2-1.1 (using .../libstdc++6_4.3.3-3_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.3.3-3) ...
-(Reading database ... 9656 files and directories currently installed.)
-Preparing to replace cpp-4.3 4.3.2-1.1 (using .../cpp-4.3_4.3.3-3_amd64.deb) ...
-Unpacking replacement cpp-4.3 ...
-Preparing to replace gcc-4.3 4.3.2-1.1 (using .../gcc-4.3_4.3.3-3_amd64.deb) ...
-Unpacking replacement gcc-4.3 ...
-Preparing to replace g++-4.3 4.3.2-1.1 (using .../g++-4.3_4.3.3-3_amd64.deb) ...
-Unpacking replacement g++-4.3 ...
-Preparing to replace libstdc++6-4.3-dev 4.3.2-1.1 (using .../libstdc++6-4.3-dev_4.3.3-3_amd64.deb) ...
-Unpacking replacement libstdc++6-4.3-dev ...
-Preparing to replace libgcc1 1:4.3.2-1.1 (using .../libgcc1_1%3a4.3.3-3_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up libgcc1 (1:4.3.3-3) ...
-(Reading database ... 9665 files and directories currently installed.)
-Preparing to replace libmpfr1ldbl 2.3.1.dfsg.1-2 (using .../libmpfr1ldbl_2.3.2.dfsg.1-1_amd64.deb) ...
-Unpacking replacement libmpfr1ldbl ...
-Preparing to replace libdb4.6 4.6.21-11 (using .../libdb4.6_4.6.21-13_amd64.deb) ...
-Unpacking replacement libdb4.6 ...
-Setting up libdb4.6 (4.6.21-13) ...
-(Reading database ... 9665 files and directories currently installed.)
-Preparing to replace tzdata 2008h-2 (using .../tzdata_2008i-3_all.deb) ...
-Unpacking replacement tzdata ...
-Setting up tzdata (2008i-3) ...
-
-Current default timezone: 'Etc/UTC'
+(Reading database ... 9656 files and directories currently installed.)
+Preparing to replace debianutils 2.30 (using .../debianutils_2.31_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.31) ...
+(Reading database ... 9656 files and directories currently installed.)
+Preparing to replace grep 2.5.3~dfsg-6 (using .../grep_2.5.4-2_amd64.deb) ...
+Unpacking replacement grep ...
+Setting up grep (2.5.4-2) ...
+(Reading database ... 9657 files and directories currently installed.)
+Preparing to replace gzip 1.3.12-6 (using .../gzip_1.3.12-7_amd64.deb) ...
+Unpacking replacement gzip ...
+Setting up gzip (1.3.12-7) ...
+(Reading database ... 9657 files and directories currently installed.)
+Preparing to replace mktemp 1.5-9 (using .../mktemp_1.6-1_amd64.deb) ...
+Unpacking replacement mktemp ...
+Setting up mktemp (1.6-1) ...
+(Reading database ... 9657 files and directories currently installed.)
+Preparing to replace sed 4.1.5-6 (using .../archives/sed_4.1.5-8_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.5-8) ...
+(Reading database ... 9657 files and directories currently installed.)
+Preparing to replace mawk 1.3.3-11.1 (using .../mawk_1.3.3-14_amd64.deb) ...
+Unpacking replacement mawk ...
+Preparing to replace libgomp1 4.3.2-1.1 (using .../libgomp1_4.3.3-3_amd64.deb) ...
+Unpacking replacement libgomp1 ...
+Preparing to replace gcc-4.3-base 4.3.2-1.1 (using .../gcc-4.3-base_4.3.3-3_amd64.deb) ...
+Unpacking replacement gcc-4.3-base ...
+Setting up gcc-4.3-base (4.3.3-3) ...
+(Reading database ... 9657 files and directories currently installed.)
+Preparing to replace libstdc++6 4.3.2-1.1 (using .../libstdc++6_4.3.3-3_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up libstdc++6 (4.3.3-3) ...
+(Reading database ... 9657 files and directories currently installed.)
+Preparing to replace cpp-4.3 4.3.2-1.1 (using .../cpp-4.3_4.3.3-3_amd64.deb) ...
+Unpacking replacement cpp-4.3 ...
+Preparing to replace gcc-4.3 4.3.2-1.1 (using .../gcc-4.3_4.3.3-3_amd64.deb) ...
+Unpacking replacement gcc-4.3 ...
+Preparing to replace g++-4.3 4.3.2-1.1 (using .../g++-4.3_4.3.3-3_amd64.deb) ...
+Unpacking replacement g++-4.3 ...
+Preparing to replace libstdc++6-4.3-dev 4.3.2-1.1 (using .../libstdc++6-4.3-dev_4.3.3-3_amd64.deb) ...
+Unpacking replacement libstdc++6-4.3-dev ...
+Preparing to replace libgcc1 1:4.3.2-1.1 (using .../libgcc1_1%3a4.3.3-3_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up libgcc1 (1:4.3.3-3) ...
+(Reading database ... 9666 files and directories currently installed.)
+Preparing to replace libmpfr1ldbl 2.3.1.dfsg.1-2 (using .../libmpfr1ldbl_2.3.2.dfsg.1-1_amd64.deb) ...
+Unpacking replacement libmpfr1ldbl ...
+Preparing to replace binutils 2.18.1~cvs20080103-7 (using .../binutils_2.19.1-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace libdb4.6 4.6.21-11 (using .../libdb4.6_4.6.21-13_amd64.deb) ...
+Unpacking replacement libdb4.6 ...
+Setting up libdb4.6 (4.6.21-13) ...
+(Reading database ... 9671 files and directories currently installed.)
+Preparing to replace libsepol1 2.0.30-2 (using .../libsepol1_2.0.32-1_amd64.deb) ...
+Unpacking replacement libsepol1 ...
+Setting up libsepol1 (2.0.32-1) ...
+telinit: timeout opening/writing control channel /dev/initctl
+(Reading database ... 9671 files and directories currently installed.)
+Preparing to replace tzdata 2008h-2 (using .../tzdata_2009b-1_all.deb) ...
+Unpacking replacement tzdata ...
+Setting up tzdata (2009b-1) ...
+
+Current default timezone: 'Etc/UTC'
 Local time is now: XXXX
 Universal Time is now: XXXX
-Run 'dpkg-reconfigure tzdata' if you wish to change it.
-
-(Reading database ... 9668 files and directories currently installed.)
-Preparing to replace libept0 0.5.22 (using .../libept0_0.5.26_amd64.deb) ...
-Unpacking replacement libept0 ...
-Preparing to replace aptitude 0.4.11.11-1~lenny1 (using .../aptitude_0.4.11.11-1_amd64.deb) ...
-Unpacking replacement aptitude ...
-Preparing to replace cpio 2.9-13 (using .../archives/cpio_2.9-14_amd64.deb) ...
-Unpacking replacement cpio ...
-Preparing to replace libgdbm3 1.8.3-3 (using .../libgdbm3_1.8.3-4_amd64.deb) ...
-Unpacking replacement libgdbm3 ...
-Setting up mawk (1.3.3-14) ...
-Setting up libgomp1 (4.3.3-3) ...
-Setting up libmpfr1ldbl (2.3.2.dfsg.1-1) ...
-Setting up cpp-4.3 (4.3.3-3) ...
-Setting up gcc-4.3 (4.3.3-3) ...
-Setting up libept0 (0.5.26) ...
-Setting up aptitude (0.4.11.11-1) ...
-Setting up cpio (2.9-14) ...
-Setting up libgdbm3 (1.8.3-4) ...
-Setting up g++-4.3 (4.3.3-3) ...
-Setting up libstdc++6-4.3-dev (4.3.3-3) ...
+Run 'dpkg-reconfigure tzdata' if you wish to change it.
+
+(Reading database ... 9677 files and directories currently installed.)
+Preparing to replace libept0 0.5.22 (using .../libept0_0.5.26_amd64.deb) ...
+Unpacking replacement libept0 ...
+Preparing to replace aptitude 0.4.11.11-1~lenny1 (using .../aptitude_0.4.11.11-1_amd64.deb) ...
+Unpacking replacement aptitude ...
+Preparing to replace cpio 2.9-13 (using .../archives/cpio_2.9-15_amd64.deb) ...
+Unpacking replacement cpio ...
+Preparing to replace libgdbm3 1.8.3-3 (using .../libgdbm3_1.8.3-4_amd64.deb) ...
+Unpacking replacement libgdbm3 ...
+Setting up mawk (1.3.3-14) ...
+Setting up libgomp1 (4.3.3-3) ...
+Setting up libmpfr1ldbl (2.3.2.dfsg.1-1) ...
+Setting up cpp-4.3 (4.3.3-3) ...
+Setting up binutils (2.19.1-1) ...
+Setting up gcc-4.3 (4.3.3-3) ...
+Setting up libept0 (0.5.26) ...
+Setting up aptitude (0.4.11.11-1) ...
+Setting up cpio (2.9-15) ...
+Setting up libgdbm3 (1.8.3-4) ...
+Setting up g++-4.3 (4.3.3-3) ...
+Setting up libstdc++6-4.3-dev (4.3.3-3) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -126,6 +146,7 @@ dpkg-dev is already the newest version.
 apt is already the newest version.
 aptitude is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+I: user script /var/cache/pbuilder/build//NUM/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh starting
 umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
@@ -133,9 +154,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//NUM/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
- -> unmounting dev/pts filesystem
- -> unmounting proc filesystem
- -> creating base tarball [/TESTDIR/testimage]
- -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
+I: user script /var/cache/pbuilder/build//NUM/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+I: unmounting dev/pts filesystem
+I: unmounting proc filesystem
+I: creating base tarball [/TESTDIR/testimage]
+I: cleaning the build env 
+I: removing directory /var/cache/pbuilder/build//NUM and its subdirectories