fix typo/thinko

42 files changed, 1601 insertions, 1259 deletions

diff --git a/ChangeLog b/ChangeLog
index 1111c3a..9d962b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* pbuilder-buildpackage-funcs: test if /etc/shadow already exists
 	before trying to change it.
+	fix typo.
 
 2005-11-11  Junichi Uekawa  <dancer@debian.org>
 
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index 31f990d..5965c83 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -90,7 +90,7 @@ function createbuilduser () {
 	    cowprotect $BUILDPLACE/etc/group
 	    echo "$BUILDUSERNAME:*:$BUILDUSERID:" >> $BUILDPLACE/etc/group
 	fi
-	if [ -e ! $BUILDPLACE/etc/shadow ] && grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/shadow; then
+	if [ -e $BUILDPLACE/etc/shadow ] && ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/shadow; then
 	    cowprotect $BUILDPLACE/etc/shadow
 	    echo "$BUILDUSERNAME:!:::::::" >> $BUILDPLACE/etc/shadow
 	fi
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index dee0656..5b40359 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -1,14 +1,14 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:40:52 JST 2005
-pbuilder-time-stamp: 1132026052
+Current time: Wed Nov 16 14:04:26 JST 2005
+pbuilder-time-stamp: 1132117466
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/10493/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/2642/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -39,7 +39,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11772 files and directories currently installed.)
+(Reading database ... 11769 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -76,11 +76,10 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/10493/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -357,6 +356,7 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
+dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -395,7 +395,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:41:43 UTC 2005
+Wed Nov 16 05:05:20 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -465,14 +465,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:41:48 UTC 2005
+Wed Nov 16 05:05:25 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -578,7 +578,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:41:50 JST 2005
-pbuilder-time-stamp: 1132026110
+Current time: Wed Nov 16 14:05:27 JST 2005
+pbuilder-time-stamp: 1132117527
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/10493 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/2642 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
index 324b2ae..1684b1e 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
@@ -1,14 +1,14 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:30:46 JST 2005
-pbuilder-time-stamp: 1132025446
+Current time: Wed Nov 16 13:53:46 JST 2005
+pbuilder-time-stamp: 1132116826
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/27135/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/18642/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -73,11 +73,10 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/27135/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -391,7 +390,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:31:33 UTC 2005
+Wed Nov 16 04:54:37 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -461,12 +460,11 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:31:38 UTC 2005
+Wed Nov 16 04:54:42 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 b: b
-dsh: Process terminated (before write).
 a: a
 c: c
 PASS: tests/segv-catcher.sh
@@ -574,7 +572,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:31:39 JST 2005
-pbuilder-time-stamp: 1132025499
+Current time: Wed Nov 16 13:54:44 JST 2005
+pbuilder-time-stamp: 1132116884
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/27135 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/18642 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index cc262fa..ed865da 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -1,14 +1,14 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:24:55 JST 2005
-pbuilder-time-stamp: 1132025095
+Current time: Wed Nov 16 13:47:07 JST 2005
+pbuilder-time-stamp: 1132116427
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/21155/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/11432/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -39,7 +39,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11780 files and directories currently installed.)
+(Reading database ... 11792 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -54,7 +54,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.0_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.6_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.7_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -70,17 +70,16 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.0) ...
-Setting up debhelper (5.0.6) ...
+Setting up debhelper (5.0.7) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/21155/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -358,6 +357,7 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
+dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -381,10 +381,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -396,7 +396,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:25:42 UTC 2005
+Wed Nov 16 04:47:58 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -466,14 +466,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:25:47 UTC 2005
+Wed Nov 16 04:48:03 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -595,7 +595,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:25:49 JST 2005
-pbuilder-time-stamp: 1132025149
+Current time: Wed Nov 16 13:48:05 JST 2005
+pbuilder-time-stamp: 1132116485
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/21155 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/11432 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index 9f82eaf..a240977 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -365,15 +365,15 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking coreutils (from .../coreutils_5.2.1-2.1_amd64.deb) ...
 P: Unpacking package coreutils
 O: Selecting previously deselected package debianutils.
-O: dpkg: regarding .../debianutils_2.15_amd64.deb containing debianutils, pre-dependency problem:
+O: dpkg: regarding .../debianutils_2.15.1_amd64.deb containing debianutils, pre-dependency problem:
 O:  debianutils pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../debianutils_2.15_amd64.deb containing debianutils, pre-dependency problem:
+O: dpkg: regarding .../debianutils_2.15.1_amd64.deb containing debianutils, pre-dependency problem:
 O:  debianutils pre-depends on coreutils (>= 4.5.8-1)
 O:   coreutils is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking debianutils (from .../debianutils_2.15_amd64.deb) ...
+O: Unpacking debianutils (from .../debianutils_2.15.1_amd64.deb) ...
 P: Unpacking package debianutils
 O: Selecting previously deselected package perl-base.
 O: dpkg: regarding .../perl-base_5.8.7-7_amd64.deb containing perl-base, pre-dependency problem:
@@ -793,7 +793,7 @@ P: Configuring package libtext-wrapi18n-perl
 O: Setting up coreutils (5.2.1-2.1) ...
 P: Configuring package coreutils
 O: 
-O: Setting up debianutils (2.15) ...
+O: Setting up debianutils (2.15.1) ...
 P: Configuring package debianutils
 O: 
 O: Setting up procps (3.2.5-1) ...
@@ -847,12 +847,14 @@ P: Configuring package debconf
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 4520 files and directories currently installed.)
+O: (Reading database ... 
+O: 4520 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 4523 files and directories currently installed.)
+O: (Reading database ... 
+O: 4523 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -865,17 +867,16 @@ O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.d
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package apt.
-O: (Reading database ... 
-O: 4525 files and directories currently installed.)
+O: (Reading database ... 4525 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.6.42.2_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.42.2) ...
 P: Configuring package apt
 O: 
 O: Get:1 bootstrap: . Release.gpg [189B]
-O: Get:2 bootstrap: . Release [4800B]
+O: Get:2 bootstrap: . Release [4972B]
 O: Ign bootstrap: . Release
-O: Fetched 4989B in 0s (49.0kB/s)
+O: Fetched 5161B in 0s (50.0kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -885,7 +886,6 @@ O: W:
 O: You may want to run apt-get update to correct these problems
 O: 
 O: Reading package lists...
-O: 
 O: Building dependency tree...
 O: 
 O: Suggested packages:
@@ -915,6 +915,7 @@ O:   liblzo1 libncursesw5 libopencdk8 libpopt0 libssl0.9.8 libtasn1-2 libwrap0
 O:   logrotate man-db manpages nano netkit-inetd tcpd netbase nvi tasksel wget
 O:   whiptail exim4-config exim4-base libgnutls12 libpcre3 exim4-daemon-light at
 O:   exim4 telnet dhcp3-common dhcp3-client psmisc
+O: debconf: delaying package configuration, since apt-utils is not installed
 O: Authentication warning overridden.
 O: Selecting previously deselected package console-data.
 O: (Reading database ... 
@@ -1057,10 +1058,10 @@ O: Selecting previously deselected package whiptail.
 O: Unpacking whiptail (from .../whiptail_0.51.6-31_amd64.deb) ...
 P: Unpacking package whiptail
 O: Selecting previously deselected package exim4-config.
-O: Unpacking exim4-config (from .../exim4-config_4.54-1_all.deb) ...
+O: Unpacking exim4-config (from .../exim4-config_4.54-2_all.deb) ...
 P: Unpacking package exim4-config
 O: Selecting previously deselected package exim4-base.
-O: Unpacking exim4-base (from .../exim4-base_4.54-1_amd64.deb) ...
+O: Unpacking exim4-base (from .../exim4-base_4.54-2_amd64.deb) ...
 P: Unpacking package exim4-base
 O: Selecting previously deselected package libgnutls12.
 O: Unpacking libgnutls12 (from .../libgnutls12_1.2.8-1_amd64.deb) ...
@@ -1069,13 +1070,13 @@ O: Selecting previously deselected package libpcre3.
 O: Unpacking libpcre3 (from .../libpcre3_6.4-1_amd64.deb) ...
 P: Unpacking package libpcre3
 O: Selecting previously deselected package exim4-daemon-light.
-O: Unpacking exim4-daemon-light (from .../exim4-daemon-light_4.54-1_amd64.deb) ...
+O: Unpacking exim4-daemon-light (from .../exim4-daemon-light_4.54-2_amd64.deb) ...
 P: Unpacking package exim4-daemon-light
 O: Selecting previously deselected package at.
 O: Unpacking at (from .../bootstrap/at_3.1.9_amd64.deb) ...
 P: Unpacking package at
 O: Selecting previously deselected package exim4.
-O: Unpacking exim4 (from .../bootstrap/exim4_4.54-1_all.deb) ...
+O: Unpacking exim4 (from .../bootstrap/exim4_4.54-2_all.deb) ...
 P: Unpacking package exim4
 O: Selecting previously deselected package telnet.
 O: Unpacking telnet (from .../telnet_0.17-32_amd64.deb) ...
@@ -1212,7 +1213,7 @@ P: Configuring package wget
 O: 
 O: Setting up whiptail (0.51.6-31) ...
 P: Configuring package whiptail
-O: Setting up exim4-config (4.54-1) ...
+O: Setting up exim4-config (4.54-2) ...
 P: Configuring package exim4-config
 O: hostname: 
 O: Host name lookup failure
@@ -1223,7 +1224,7 @@ O:
 O: Adding system-user for exim (v4)
 O: chage: the shadow password file is not present
 O: 
-O: Setting up exim4-base (4.54-1) ...
+O: Setting up exim4-base (4.54-2) ...
 P: Configuring package exim4-base
 O: 
 O: Setting up libgnutls12 (1.2.8-1) ...
@@ -1232,13 +1233,13 @@ O:
 O: Setting up libpcre3 (6.4-1) ...
 P: Configuring package libpcre3
 O: 
-O: Setting up exim4-daemon-light (4.54-1) ...
+O: Setting up exim4-daemon-light (4.54-2) ...
 P: Configuring package exim4-daemon-light
 O: 
 O: Setting up at (3.1.9) ...
 P: Configuring package at
 O: 
-O: Setting up exim4 (4.54-1) ...
+O: Setting up exim4 (4.54-2) ...
 P: Configuring package exim4
 O: Setting up telnet (0.17-32) ...
 P: Configuring package telnet
@@ -1277,18 +1278,18 @@ P: Configuring package base-config
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 7425 files and directories currently installed.)
+O: 7422 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 7424 files and directories currently installed.)
+O: 7421 files and directories currently installed.)
 O: Removing cdebootstrap-helper-diverts ...
 O: Purging configuration files for cdebootstrap-helper-diverts ...
 O: Removing `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Removing `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
 P: Deconfiguring helper cdebootstrap-helper-makedev
 O: (Reading database ... 
-O: 7422 files and directories currently installed.)
+O: 7419 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1301,10 +1302,10 @@ Refreshing the base.tgz
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
-Get:2 http://ftp.jp.debian.org etch Release [4800B]
+Get:2 http://ftp.jp.debian.org etch Release [4972B]
 Ign http://ftp.jp.debian.org etch Release
-Get:3 http://ftp.jp.debian.org etch/main Packages [3441kB]
-Fetched 3446kB in 1s (1866kB/s)
+Get:3 http://ftp.jp.debian.org etch/main Packages [3448kB]
+Fetched 3454kB in 1s (1931kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org etch Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -1338,7 +1339,7 @@ WARNING: The following packages cannot be authenticated!
   libstdc++6-4.0-dev g++-4.0 g++ linux-kernel-headers libc6-dev
   build-essential
 Selecting previously deselected package binutils.
-(Reading database ... 7422 files and directories currently installed.)
+(Reading database ... 7419 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1-2_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-2_amd64.deb) ...
@@ -1394,6 +1395,6 @@ Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//26888 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19087 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sarge.log b/testsuite/cdebootstrap/pbuilder-create-sarge.log
index 47362db..31a4317 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sarge.log
@@ -764,7 +764,8 @@ O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 4196 files and directories currently installed.)
+O: (Reading database ... 
+O: 4196 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -1217,7 +1218,7 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sarge/main Packages [3223kB]
 Get:2 http://ftp.jp.debian.org sarge/main Release [110B]
-Fetched 3223kB in 1s (1878kB/s)
+Fetched 3223kB in 1s (1948kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -1300,6 +1301,6 @@ Setting up build-essential (10.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//10537 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//1825 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index 5b3c24e..28776ab 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -26,6 +26,8 @@ P: Retrieving libattr1
 P: Validating libattr1
 P: Retrieving libacl1
 P: Validating libacl1
+P: Retrieving libselinux1
+P: Validating libselinux1
 P: Retrieving coreutils
 P: Validating coreutils
 P: Retrieving debianutils
@@ -100,8 +102,6 @@ P: Retrieving libpam-runtime
 P: Validating libpam-runtime
 P: Retrieving libpam0g
 P: Validating libpam0g
-P: Retrieving libselinux1
-P: Validating libselinux1
 P: Retrieving libcap1
 P: Validating libcap1
 P: Retrieving libdb4.3
@@ -248,6 +248,7 @@ P: Extracting gcc-4.0-base
 P: Extracting libstdc++6
 P: Extracting libattr1
 P: Extracting libacl1
+P: Extracting libselinux1
 P: Extracting coreutils
 P: Extracting debianutils
 P: Extracting perl-base
@@ -266,7 +267,6 @@ P: Extracting bsdutils
 P: Extracting dpkg
 P: Extracting libpam-runtime
 P: Extracting libpam0g
-P: Extracting libselinux1
 P: Extracting libcap1
 P: Extracting libdb4.3
 P: Extracting libpam-modules
@@ -312,12 +312,13 @@ O: Setting up base-passwd (3.5.10) ...
 P: Configuring package base-passwd
 O: 
 O: Selecting previously deselected package dpkg.
-O: (Reading database ... 21 files and directories currently installed.)
-O: Unpacking dpkg (from .../dpkg_1.13.11_amd64.deb) ...
-P: Unpacking package dpkg
 O: dpkg: regarding .../dpkg_1.13.11_amd64.deb containing dpkg, pre-dependency problem:
 O:  dpkg pre-depends on libc6 (>= 2.3.5-1)
 O: dpkg: warning - ignoring pre-dependency problem !
+O: (Reading database ... 
+O: 21 files and directories currently installed.)
+O: Unpacking dpkg (from .../dpkg_1.13.11_amd64.deb) ...
+P: Unpacking package dpkg
 O: dpkg: dpkg: dependency problems, but configuring anyway as you request:
 O:  dpkg depends on libc6 (>= 2.3.5-1); however:
 O:   Package libc6 is not installed.
@@ -326,22 +327,20 @@ O:   Package coreutils is not installed.
 O:   Package textutils is not installed.
 O: Setting up dpkg (1.13.11) ...
 P: Configuring package dpkg
-O: Adding `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
-O: Adding `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 O: 
 O: Selecting previously deselected package libc6.
 O: (Reading database ... 
-O: 224 files and directories currently installed.)
+O: 220 files and directories currently installed.)
 O: Unpacking libc6 (from .../libc6_2.3.5-7_amd64.deb) ...
 P: Unpacking package libc6
 O: Selecting previously deselected package libgcc1.
-O: Unpacking libgcc1 (from .../libgcc1_4.0.2-2_amd64.deb) ...
+O: Unpacking libgcc1 (from .../libgcc1_4.0.2-3_amd64.deb) ...
 P: Unpacking package libgcc1
 O: Selecting previously deselected package gcc-4.0-base.
-O: Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-2_amd64.deb) ...
+O: Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-3_amd64.deb) ...
 P: Unpacking package gcc-4.0-base
 O: Selecting previously deselected package libstdc++6.
-O: Unpacking libstdc++6 (from .../libstdc++6_4.0.2-2_amd64.deb) ...
+O: Unpacking libstdc++6 (from .../libstdc++6_4.0.2-3_amd64.deb) ...
 P: Unpacking package libstdc++6
 O: Selecting previously deselected package libattr1.
 O: Unpacking libattr1 (from .../libattr1_2.4.25-1_amd64.deb) ...
@@ -349,17 +348,26 @@ P: Unpacking package libattr1
 O: Selecting previously deselected package libacl1.
 O: Unpacking libacl1 (from .../libacl1_2.2.32-1_amd64.deb) ...
 P: Unpacking package libacl1
+O: Selecting previously deselected package libselinux1.
+O: Unpacking libselinux1 (from .../libselinux1_1.26-1_amd64.deb) ...
+P: Unpacking package libselinux1
 O: Selecting previously deselected package coreutils.
-O: dpkg: regarding .../coreutils_5.2.1-2.1_amd64.deb containing coreutils, pre-dependency problem:
+O: dpkg: regarding .../coreutils_5.93-2_amd64.deb containing coreutils, pre-dependency problem:
 O:  coreutils pre-depends on libacl1 (>= 2.2.11-1)
 O:   libacl1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../coreutils_5.2.1-2.1_amd64.deb containing coreutils, pre-dependency problem:
+O: dpkg: regarding .../coreutils_5.93-2_amd64.deb containing coreutils, pre-dependency problem:
 O:  coreutils pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking coreutils (from .../coreutils_5.2.1-2.1_amd64.deb) ...
+O: dpkg: regarding .../coreutils_5.93-2_amd64.deb containing coreutils, pre-dependency problem:
+O:  coreutils pre-depends on libselinux1 (>= 1.26)
+O:   libselinux1 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: Unpacking coreutils (from .../coreutils_5.93-2_amd64.deb) ...
 P: Unpacking package coreutils
+O: No diversion `any diversion of /usr/share/man/man1/md5sum.textutils.1.gz', none removed
+O: No diversion `any diversion of /usr/bin/md5sum.textutils', none removed
 O: Selecting previously deselected package debianutils.
 O: dpkg: regarding .../debianutils_2.15.1_amd64.deb containing debianutils, pre-dependency problem:
 O:  debianutils pre-depends on libc6 (>= 2.3.5-1)
@@ -372,11 +380,11 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking debianutils (from .../debianutils_2.15.1_amd64.deb) ...
 P: Unpacking package debianutils
 O: Selecting previously deselected package perl-base.
-O: dpkg: regarding .../perl-base_5.8.7-7_amd64.deb containing perl-base, pre-dependency problem:
+O: dpkg: regarding .../perl-base_5.8.7-8_amd64.deb containing perl-base, pre-dependency problem:
 O:  perl-base pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking perl-base (from .../perl-base_5.8.7-7_amd64.deb) ...
+O: Unpacking perl-base (from .../perl-base_5.8.7-8_amd64.deb) ...
 P: Unpacking package perl-base
 O: Selecting previously deselected package liblocale-gettext-perl.
 O: dpkg: regarding .../liblocale-gettext-perl_1.05-1_amd64.deb containing liblocale-gettext-perl, pre-dependency problem:
@@ -448,9 +456,6 @@ P: Unpacking package libpam-runtime
 O: Selecting previously deselected package libpam0g.
 O: Unpacking libpam0g (from .../libpam0g_0.79-3_amd64.deb) ...
 P: Unpacking package libpam0g
-O: Selecting previously deselected package libselinux1.
-O: Unpacking libselinux1 (from .../libselinux1_1.26-1_amd64.deb) ...
-P: Unpacking package libselinux1
 O: Selecting previously deselected package libcap1.
 O: Unpacking libcap1 (from .../libcap1_1.10-14_amd64.deb) ...
 P: Unpacking package libcap1
@@ -553,33 +558,33 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking e2fsprogs (from .../e2fsprogs_1.38-2_amd64.deb) ...
 P: Unpacking package e2fsprogs
 O: Selecting previously deselected package initscripts.
-O: Unpacking initscripts (from .../initscripts_2.86.ds1-4_amd64.deb) ...
+O: Unpacking initscripts (from .../initscripts_2.86.ds1-5_amd64.deb) ...
 P: Unpacking package initscripts
 O: Selecting previously deselected package sysv-rc.
-O: Unpacking sysv-rc (from .../sysv-rc_2.86.ds1-4_all.deb) ...
+O: Unpacking sysv-rc (from .../sysv-rc_2.86.ds1-5_all.deb) ...
 P: Unpacking package sysv-rc
 O: Selecting previously deselected package sysvinit.
-O: dpkg: regarding .../sysvinit_2.86.ds1-4_amd64.deb containing sysvinit, pre-dependency problem:
+O: dpkg: regarding .../sysvinit_2.86.ds1-5_amd64.deb containing sysvinit, pre-dependency problem:
 O:  sysvinit pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../sysvinit_2.86.ds1-4_amd64.deb containing sysvinit, pre-dependency problem:
+O: dpkg: regarding .../sysvinit_2.86.ds1-5_amd64.deb containing sysvinit, pre-dependency problem:
 O:  sysvinit pre-depends on libselinux1 (>= 1.26)
 O:   libselinux1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../sysvinit_2.86.ds1-4_amd64.deb containing sysvinit, pre-dependency problem:
+O: dpkg: regarding .../sysvinit_2.86.ds1-5_amd64.deb containing sysvinit, pre-dependency problem:
 O:  sysvinit pre-depends on libsepol1 (>= 1.8)
 O:   libsepol1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../sysvinit_2.86.ds1-4_amd64.deb containing sysvinit, pre-dependency problem:
+O: dpkg: regarding .../sysvinit_2.86.ds1-5_amd64.deb containing sysvinit, pre-dependency problem:
 O:  sysvinit pre-depends on initscripts
 O:   initscripts is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../sysvinit_2.86.ds1-4_amd64.deb containing sysvinit, pre-dependency problem:
+O: dpkg: regarding .../sysvinit_2.86.ds1-5_amd64.deb containing sysvinit, pre-dependency problem:
 O:  sysvinit pre-depends on sysv-rc (>= 2.85-2) | file-rc (>> 0.7.0)
 O:   sysv-rc is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking sysvinit (from .../sysvinit_2.86.ds1-4_amd64.deb) ...
+O: Unpacking sysvinit (from .../sysvinit_2.86.ds1-5_amd64.deb) ...
 P: Unpacking package sysvinit
 O: Selecting previously deselected package procps.
 O: Unpacking procps (from .../procps_3.2.6-2_amd64.deb) ...
@@ -677,10 +682,10 @@ P: Unpacking package makedev
 O: Setting up makedev (2.3.1-79) ...
 P: Configuring package makedev
 O: 
-O: Setting up sysv-rc (2.86.ds1-4) ...
+O: Setting up sysv-rc (2.86.ds1-5) ...
 P: Configuring package sysv-rc
 O: 
-O: Setting up gcc-4.0-base (4.0.2-2) ...
+O: Setting up gcc-4.0-base (4.0.2-3) ...
 P: Configuring package gcc-4.0-base
 O: Setting up libpam-runtime (0.79-3) ...
 P: Configuring package libpam-runtime
@@ -701,7 +706,7 @@ O:
 O: Setting up bsdutils (2.12p-8) ...
 P: Configuring package bsdutils
 O: 
-O: Setting up perl-base (5.8.7-7) ...
+O: Setting up perl-base (5.8.7-8) ...
 P: Configuring package perl-base
 O: Setting up libsepol1 (1.8-1) ...
 P: Configuring package libsepol1
@@ -713,7 +718,7 @@ O:
 O: Setting up zlib1g (1.2.3-6) ...
 P: Configuring package zlib1g
 O: 
-O: Setting up libgcc1 (4.0.2-2) ...
+O: Setting up libgcc1 (4.0.2-3) ...
 P: Configuring package libgcc1
 O: 
 O: Setting up libtext-iconv-perl (1.4-2) ...
@@ -773,14 +778,14 @@ O:
 O: Setting up util-linux (2.12p-8) ...
 P: Configuring package util-linux
 O: 
-O: Setting up libstdc++6 (4.0.2-2) ...
+O: Setting up libstdc++6 (4.0.2-3) ...
 P: Configuring package libstdc++6
 O: 
 O: Setting up libtext-charwidth-perl (0.04-3) ...
 P: Configuring package libtext-charwidth-perl
 O: Setting up libtext-wrapi18n-perl (0.06-4) ...
 P: Configuring package libtext-wrapi18n-perl
-O: Setting up coreutils (5.2.1-2.1) ...
+O: Setting up coreutils (5.93-2) ...
 P: Configuring package coreutils
 O: 
 O: Setting up debianutils (2.15.1) ...
@@ -818,13 +823,13 @@ P: Configuring package lsb-base
 O: Setting up passwd (4.0.13-6) ...
 P: Configuring package passwd
 O: 
-O: Setting up initscripts (2.86.ds1-4) ...
+O: Setting up initscripts (2.86.ds1-5) ...
 P: Configuring package initscripts
 O: 
 O: Setting up bash (3.0-17) ...
 P: Configuring package bash
 O: 
-O: Setting up sysvinit (2.86.ds1-4) ...
+O: Setting up sysvinit (2.86.ds1-5) ...
 P: Configuring package sysvinit
 O: sysvinit: creating /dev/initctl
 O: init: 
@@ -837,12 +842,13 @@ P: Configuring package debconf
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 4512 files and directories currently installed.)
+O: (Reading database ... 4526 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 4515 files and directories currently installed.)
+O: (Reading database ... 
+O: 4529 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -850,22 +856,22 @@ O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
 O: (Reading database ... 
-O: 4517 files and directories currently installed.)
+O: 4531 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package apt.
 O: (Reading database ... 
-O: 4517 files and directories currently installed.)
+O: 4531 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.6.42.3_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.42.3) ...
 P: Configuring package apt
 O: 
 O: Get:1 bootstrap: . Release.gpg [189B]
-O: Get:2 bootstrap: . Release [4800B]
+O: Get:2 bootstrap: . Release [5336B]
 O: Ign bootstrap: . Release
-O: Fetched 4989B in 0s (44.0kB/s)
+O: Fetched 5525B in 0s (49.8kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -884,7 +890,7 @@ O:   whois vacation kbd-compat anacron lockfile-progs checksecurity resolvconf
 O:   mail-reader eximon4 exim4-doc-html exim4-doc-info gnutls-bin groff iproute
 O:   ppp rng-tools less www-browser spell
 O: Recommended packages:
-O:   aptitude-doc-en aptitude-doc libgpmg1 mailx
+O:   aptitude-doc-en aptitude-doc libgpmg1 libtasn1-2-bin mailx
 O: The following NEW packages will be installed:
 O:   adduser apt-utils aptitude at base-config bsdmainutils console-common
 O:   console-data console-tools cpio cron dhcp3-client dhcp3-common dmidecode ed
@@ -896,7 +902,7 @@ O:   libwrap0 logrotate man-db manpages nano net-tools netbase netkit-inetd nvi
 O:   psmisc sysklogd tasksel tcpd telnet wget whiptail
 O: 0 upgraded, 57 newly installed, 0 to remove and 0 not upgraded.
 O: Need to get 15.3MB of archives.
-O: After unpacking 47.4MB of additional disk space will be used.
+O: After unpacking 47.5MB of additional disk space will be used.
 O: WARNING: The following packages cannot be authenticated!
 O:   console-data libconsole console-tools console-common adduser libdb4.2
 O:   apt-utils libncursesw5 libsigc++-2.0-0c2 aptitude gettext-base base-config
@@ -906,10 +912,11 @@ O:   libgdbm3 liblzo1 libopencdk8 libpopt0 libssl0.9.8 libtasn1-2 libwrap0
 O:   logrotate man-db manpages nano netkit-inetd tcpd netbase nvi tasksel wget
 O:   whiptail exim4-config exim4-base libgnutls12 libpcre3 exim4-daemon-light at
 O:   exim4 telnet dhcp3-common dhcp3-client psmisc
+O: debconf: delaying package configuration, since apt-utils is not installed
 O: Authentication warning overridden.
 O: Selecting previously deselected package console-data.
 O: (Reading database ... 
-O: 4683 files and directories currently installed.)
+O: 4697 files and directories currently installed.)
 O: Unpacking console-data (from .../console-data_2002.12.04dbs-50_all.deb) ...
 P: Unpacking package console-data
 O: Selecting previously deselected package libconsole.
@@ -1006,10 +1013,10 @@ O: Selecting previously deselected package libpopt0.
 O: Unpacking libpopt0 (from .../libpopt0_1.7-5_amd64.deb) ...
 P: Unpacking package libpopt0
 O: Selecting previously deselected package libssl0.9.8.
-O: Unpacking libssl0.9.8 (from .../libssl0.9.8_0.9.8a-3_amd64.deb) ...
+O: Unpacking libssl0.9.8 (from .../libssl0.9.8_0.9.8a-4_amd64.deb) ...
 P: Unpacking package libssl0.9.8
 O: Selecting previously deselected package libtasn1-2.
-O: Unpacking libtasn1-2 (from .../libtasn1-2_0.2.13-1_amd64.deb) ...
+O: Unpacking libtasn1-2 (from .../libtasn1-2_0.2.17-1_amd64.deb) ...
 P: Unpacking package libtasn1-2
 O: Selecting previously deselected package libwrap0.
 O: Unpacking libwrap0 (from .../libwrap0_7.6.dbs-8_amd64.deb) ...
@@ -1021,7 +1028,7 @@ O: Selecting previously deselected package man-db.
 O: Unpacking man-db (from .../man-db_2.4.3-3_amd64.deb) ...
 P: Unpacking package man-db
 O: Selecting previously deselected package manpages.
-O: Unpacking manpages (from .../manpages_2.03-1_all.deb) ...
+O: Unpacking manpages (from .../manpages_2.05-1_all.deb) ...
 P: Unpacking package manpages
 O: Selecting previously deselected package nano.
 O: Unpacking nano (from .../nano_1.3.9-1_amd64.deb) ...
@@ -1054,7 +1061,7 @@ O: Selecting previously deselected package exim4-base.
 O: Unpacking exim4-base (from .../exim4-base_4.54-2_amd64.deb) ...
 P: Unpacking package exim4-base
 O: Selecting previously deselected package libgnutls12.
-O: Unpacking libgnutls12 (from .../libgnutls12_1.2.8-1_amd64.deb) ...
+O: Unpacking libgnutls12 (from .../libgnutls12_1.2.9-1_amd64.deb) ...
 P: Unpacking package libgnutls12
 O: Selecting previously deselected package libpcre3.
 O: Unpacking libpcre3 (from .../libpcre3_6.4-1_amd64.deb) ...
@@ -1127,7 +1134,7 @@ P: Configuring package net-tools
 O: Setting up ifupdown (0.6.7) ...
 P: Configuring package ifupdown
 O: df: 
-O: Warning: cannot read table of mounted filesystems
+O: Warning: cannot read table of mounted file systems
 O: : No such file or directory
 O: 
 O: ifupdown.postinst: Warning: No 'iface lo' definition found in /etc/network/interfaces
@@ -1160,10 +1167,10 @@ O:
 O: Setting up libpopt0 (1.7-5) ...
 P: Configuring package libpopt0
 O: 
-O: Setting up libssl0.9.8 (0.9.8a-3) ...
+O: Setting up libssl0.9.8 (0.9.8a-4) ...
 P: Configuring package libssl0.9.8
 O: 
-O: Setting up libtasn1-2 (0.2.13-1) ...
+O: Setting up libtasn1-2 (0.2.17-1) ...
 P: Configuring package libtasn1-2
 O: 
 O: Setting up libwrap0 (7.6.dbs-8) ...
@@ -1175,7 +1182,7 @@ O: Setting up man-db (2.4.3-3) ...
 P: Configuring package man-db
 O: Building database of manual pages ...
 O: 
-O: Setting up manpages (2.03-1) ...
+O: Setting up manpages (2.05-1) ...
 P: Configuring package manpages
 O: Setting up nano (1.3.9-1) ...
 P: Configuring package nano
@@ -1217,7 +1224,7 @@ O:
 O: Setting up exim4-base (4.54-2) ...
 P: Configuring package exim4-base
 O: 
-O: Setting up libgnutls12 (1.2.8-1) ...
+O: Setting up libgnutls12 (1.2.9-1) ...
 P: Configuring package libgnutls12
 O: 
 O: Setting up libpcre3 (6.4-1) ...
@@ -1268,18 +1275,18 @@ P: Configuring package base-config
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 7425 files and directories currently installed.)
+O: 7437 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 7424 files and directories currently installed.)
+O: 7436 files and directories currently installed.)
 O: Removing cdebootstrap-helper-diverts ...
 O: Purging configuration files for cdebootstrap-helper-diverts ...
 O: Removing `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Removing `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
 P: Deconfiguring helper cdebootstrap-helper-makedev
 O: (Reading database ... 
-O: 7422 files and directories currently installed.)
+O: 7434 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1292,10 +1299,10 @@ Refreshing the base.tgz
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
-Get:2 http://ftp.jp.debian.org sid Release [4800B]
+Get:2 http://ftp.jp.debian.org sid Release [5336B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3728kB]
-Fetched 3733kB in 2s (1854kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3738kB]
+Fetched 3744kB in 2s (1693kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -1322,23 +1329,23 @@ The following NEW packages will be installed:
   libc6-dev libstdc++6-4.0-dev linux-kernel-headers make patch perl
   perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/20.6MB of archives.
-After unpacking 82.1MB of additional disk space will be used.
+Need to get 0B/20.7MB of archives.
+After unpacking 82.3MB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   binutils cpp-4.0 cpp perl-modules perl patch make dpkg-dev gcc-4.0 gcc
   libstdc++6-4.0-dev g++-4.0 g++ linux-kernel-headers libc6-dev
   build-essential
 Selecting previously deselected package binutils.
-(Reading database ... 7422 files and directories currently installed.)
-Unpacking binutils (from .../binutils_2.16.1cvs20050902-1_amd64.deb) ...
+(Reading database ... 7434 files and directories currently installed.)
+Unpacking binutils (from .../binutils_2.16.1cvs20051109-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
-Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-2_amd64.deb) ...
+Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-3_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package perl-modules.
-Unpacking perl-modules (from .../perl-modules_5.8.7-7_all.deb) ...
+Unpacking perl-modules (from .../perl-modules_5.8.7-8_all.deb) ...
 Selecting previously deselected package perl.
-Unpacking perl (from .../perl_5.8.7-7_amd64.deb) ...
+Unpacking perl (from .../perl_5.8.7-8_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-2_amd64.deb) ...
 Selecting previously deselected package make.
@@ -1346,13 +1353,13 @@ Unpacking make (from .../make_3.80-11_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
 Unpacking dpkg-dev (from .../dpkg-dev_1.13.11_all.deb) ...
 Selecting previously deselected package gcc-4.0.
-Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-2_amd64.deb) ...
+Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-3_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package libstdc++6-4.0-dev.
-Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-2_amd64.deb) ...
+Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-3_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
-Unpacking g++-4.0 (from .../g++-4.0_4.0.2-2_amd64.deb) ...
+Unpacking g++-4.0 (from .../g++-4.0_4.0.2-3_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
@@ -1361,30 +1368,30 @@ Selecting previously deselected package libc6-dev.
 Unpacking libc6-dev (from .../libc6-dev_2.3.5-7_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.1_amd64.deb) ...
-Setting up binutils (2.16.1cvs20050902-1) ...
+Setting up binutils (2.16.1cvs20051109-1) ...
 
-Setting up cpp-4.0 (4.0.2-2) ...
+Setting up cpp-4.0 (4.0.2-3) ...
 Setting up cpp (4.0.2-1) ...
 Setting up patch (2.5.9-2) ...
 Setting up make (3.80-11) ...
 
-Setting up gcc-4.0 (4.0.2-2) ...
+Setting up gcc-4.0 (4.0.2-3) ...
 Setting up gcc (4.0.2-1) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
 Setting up libc6-dev (2.3.5-7) ...
-Setting up libstdc++6-4.0-dev (4.0.2-2) ...
-Setting up perl-modules (5.8.7-7) ...
-Setting up g++-4.0 (4.0.2-2) ...
+Setting up libstdc++6-4.0-dev (4.0.2-3) ...
+Setting up perl-modules (5.8.7-8) ...
+Setting up g++-4.0 (4.0.2-3) ...
 Setting up g++ (4.0.2-1) ...
 
-Setting up perl (5.8.7-7) ...
+Setting up perl (5.8.7-8) ...
 
 Setting up dpkg-dev (1.13.11) ...
 Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//2231 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24875 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index bc78f6f..11ba660 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-etch.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//31212/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//23740/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31212 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23740 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sarge.log b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
index 2456d33..683db92 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//15478/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//7224/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//15478 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//7224 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index 6b1e477..85e26b8 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sid.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//9536/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//772/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//9536 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//772 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 8add8d1..e8e24cb 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//3580/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//28628/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,8 +18,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [120kB]
-Fetched 125kB in 0s (316kB/s)
+Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [125kB]
+Fetched 130kB in 0s (384kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -28,17 +28,31 @@ dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
+The following packages will be REMOVED:
+  aptitude tasksel
 The following packages will be upgraded:
-  diff
-1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/246kB of archives.
-After unpacking 303kB of additional disk space will be used.
+  apt apt-utils diff
+3 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0B/1713kB of archives.
+After unpacking 8729kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
-  diff
-(Reading database ... 11797 files and directories currently installed.)
+  diff apt-utils apt
+(Reading database ... 11809 files and directories currently installed.)
+Removing tasksel ...
+Removing aptitude ...
+(Reading database ... 11619 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
+(Reading database ... 11627 files and directories currently installed.)
+Preparing to replace apt-utils 0.6.42.3 (using .../apt-utils_0.6.42.3exp1_amd64.deb) ...
+Unpacking replacement apt-utils ...
+Preparing to replace apt 0.6.42.3 (using .../apt_0.6.42.3exp1_amd64.deb) ...
+Unpacking replacement apt ...
+Setting up apt (0.6.42.3exp1) ...
+
+Setting up apt-utils (0.6.42.3exp1) ...
+
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -48,6 +62,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//3580 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//28628 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 594c073..7e62898 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
@@ -1,20 +1,20 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//32209/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//24787/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
-Get:2 http://ftp.jp.debian.org sid Release [4800B]
+Get:2 http://ftp.jp.debian.org sid Release [5336B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3728kB]
-Fetched 3733kB in 2s (1737kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3738kB]
+Fetched 3744kB in 2s (1769kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -25,46 +25,49 @@ Building dependency tree...
 The following NEW packages will be installed:
   libsigc++-2.0-0c2
 The following packages will be upgraded:
-  apt apt-utils aptitude binutils console-data console-tools cron debconf
-  debconf-i18n debianutils exim4 exim4-base exim4-config exim4-daemon-light
-  grep libc6 libc6-dev libconsole libdb4.2 libdb4.3 libncurses5 libncursesw5
-  libslang2 login makedev manpages nano ncurses-base ncurses-bin passwd procps
-  psmisc sed tasksel zlib1g
-35 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/21.9MB of archives.
-After unpacking 2634kB of additional disk space will be used.
+  apt apt-utils aptitude binutils console-data console-tools coreutils cpp-4.0
+  cron debconf debconf-i18n g++-4.0 gcc-4.0 gcc-4.0-base grep initscripts
+  libc6 libc6-dev libconsole libdb4.2 libdb4.3 libgcc1 libgnutls12 libncurses5
+  libncursesw5 libslang2 libssl0.9.8 libstdc++6 libstdc++6-4.0-dev libtasn1-2
+  login makedev manpages nano ncurses-base ncurses-bin passwd perl perl-base
+  perl-modules procps psmisc sed sysv-rc sysvinit tasksel zlib1g
+47 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/39.7MB of archives.
+After unpacking 3555kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  debianutils grep login ncurses-bin sed libc6-dev libc6 libncurses5
-  ncurses-base debconf-i18n debconf apt libslang2 passwd zlib1g libdb4.2
-  apt-utils libncursesw5 libsigc++-2.0-0c2 aptitude console-data console-tools
-  libconsole cron manpages nano tasksel libdb4.3 makedev procps binutils
-  exim4-config exim4-base exim4-daemon-light exim4 psmisc
-(Reading database ... 11772 files and directories currently installed.)
-Preparing to replace debianutils 2.15 (using .../debianutils_2.15.1_amd64.deb) ...
-Unpacking replacement debianutils ...
-Setting up debianutils (2.15.1) ...
-
-(Reading database ... 11772 files and directories currently installed.)
+  coreutils grep login ncurses-bin perl-modules libc6-dev libc6 libdb4.3 perl
+  perl-base sed sysvinit libncurses5 ncurses-base debconf-i18n debconf libgcc1
+  libstdc++6-4.0-dev g++-4.0 gcc-4.0 cpp-4.0 binutils gcc-4.0-base libstdc++6
+  apt initscripts libslang2 passwd sysv-rc zlib1g libdb4.2 apt-utils
+  libncursesw5 libsigc++-2.0-0c2 aptitude console-data console-tools
+  libconsole cron libssl0.9.8 libtasn1-2 manpages nano tasksel makedev procps
+  libgnutls12 psmisc
+Preconfiguring packages ...
+(Reading database ... 11769 files and directories currently installed.)
+Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-2_amd64.deb) ...
+Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
+Removing `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
+Unpacking replacement coreutils ...
+Setting up coreutils (5.93-2) ...
+
+(Reading database ... 11783 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds2-2 (using .../grep_2.5.1.ds2-4_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-4) ...
 
-(Reading database ... 11772 files and directories currently installed.)
+(Reading database ... 11783 files and directories currently installed.)
 Preparing to replace login 1:4.0.13-1 (using .../login_1%3a4.0.13-6_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-6) ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11772 files and directories currently installed.)
+(Reading database ... 11783 files and directories currently installed.)
 Preparing to replace ncurses-bin 5.4-9 (using .../ncurses-bin_5.5-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.5-1) ...
-(Reading database ... 11772 files and directories currently installed.)
-Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
-Unpacking replacement sed ...
-Setting up sed (4.1.4-4) ...
-
-(Reading database ... 11773 files and directories currently installed.)
+(Reading database ... 11783 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.7-7 (using .../perl-modules_5.8.7-8_all.deb) ...
+Unpacking replacement perl-modules ...
 Preparing to replace libc6-dev 2.3.5-6 (using .../libc6-dev_2.3.5-7_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.5-6 (using .../libc6_2.3.5-7_amd64.deb) ...
@@ -72,44 +75,114 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-7) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 Current default timezone: 'UTC'.
-Local time is now:      Tue Nov 15 03:45:09 UTC 2005.
-Universal Time is now:  Tue Nov 15 03:45:09 UTC 2005.
+Local time is now:      Wed Nov 16 05:08:59 UTC 2005.
+Universal Time is now:  Wed Nov 16 05:08:59 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11773 files and directories currently installed.)
+(Reading database ... 11783 files and directories currently installed.)
+Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
+Preparing to replace perl 5.8.7-7 (using .../perl_5.8.7-8_amd64.deb) ...
+Unpacking replacement perl ...
+Preparing to replace perl-base 5.8.7-7 (using .../perl-base_5.8.7-8_amd64.deb) ...
+Unpacking replacement perl-base ...
+Setting up perl-base (5.8.7-8) ...
+(Reading database ... 11781 files and directories currently installed.)
+Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.4-4) ...
+
+(Reading database ... 11782 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-5_amd64.deb) ...
+Unpacking replacement sysvinit ...
+Setting up sysvinit (2.86.ds1-5) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 11782 files and directories currently installed.)
 Preparing to replace libncurses5 5.4-9 (using .../libncurses5_5.5-1_amd64.deb) ...
 Unpacking replacement libncurses5 ...
 Setting up libncurses5 (5.5-1) ...
 
-(Reading database ... 11773 files and directories currently installed.)
+(Reading database ... 11782 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-9 (using .../ncurses-base_5.5-1_all.deb) ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.5-1) ...
-(Reading database ... 11773 files and directories currently installed.)
+(Reading database ... 11782 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.4.58 (using .../debconf-i18n_1.4.59_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.58 (using .../debconf_1.4.59_all.deb) ...
 Unpacking replacement debconf ...
+Preparing to replace libgcc1 1:4.0.2-2 (using .../libgcc1_1%3a4.0.2-3_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up libgcc1 (4.0.2-3) ...
+
+(Reading database ... 11785 files and directories currently installed.)
+Preparing to replace libstdc++6-4.0-dev 4.0.2-2 (using .../libstdc++6-4.0-dev_4.0.2-3_amd64.deb) ...
+Unpacking replacement libstdc++6-4.0-dev ...
+Preparing to replace g++-4.0 4.0.2-2 (using .../g++-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement g++-4.0 ...
+Preparing to replace gcc-4.0 4.0.2-2 (using .../gcc-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement gcc-4.0 ...
+Preparing to replace cpp-4.0 4.0.2-2 (using .../cpp-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement cpp-4.0 ...
+Preparing to replace binutils 2.16.1-2 (using .../binutils_2.16.1cvs20051109-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace gcc-4.0-base 4.0.2-2 (using .../gcc-4.0-base_4.0.2-3_amd64.deb) ...
+Unpacking replacement gcc-4.0-base ...
+Preparing to replace libstdc++6 4.0.2-2 (using .../libstdc++6_4.0.2-3_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up gcc-4.0-base (4.0.2-3) ...
+Setting up libstdc++6 (4.0.2-3) ...
+
+(Reading database ... 11795 files and directories currently installed.)
 Preparing to replace apt 0.6.42.2 (using .../apt_0.6.42.3_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.42.3) ...
 
-(Reading database ... 11776 files and directories currently installed.)
+(Reading database ... 11795 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-5_amd64.deb) ...
+Unpacking replacement initscripts ...
+Setting up initscripts (2.86.ds1-5) ...
+Installing new version of config file /etc/init.d/bootclean.sh ...
+Installing new version of config file /etc/init.d/bootlogd ...
+Installing new version of config file /etc/init.d/bootmisc.sh ...
+Installing new version of config file /etc/init.d/checkfs.sh ...
+Installing new version of config file /etc/init.d/checkroot.sh ...
+Installing new version of config file /etc/init.d/halt ...
+Installing new version of config file /etc/init.d/hostname.sh ...
+Installing new version of config file /etc/init.d/mountall.sh ...
+Installing new version of config file /etc/init.d/mountnfs.sh ...
+Installing new version of config file /etc/init.d/mountvirtfs ...
+Installing new version of config file /etc/init.d/reboot ...
+Installing new version of config file /etc/init.d/rmnologin ...
+Installing new version of config file /etc/init.d/sendsigs ...
+Installing new version of config file /etc/init.d/single ...
+Installing new version of config file /etc/init.d/umountfs ...
+Installing new version of config file /etc/init.d/umountnfs.sh ...
+Installing new version of config file /etc/init.d/umountroot ...
+Installing new version of config file /etc/init.d/urandom ...
+
+(Reading database ... 11795 files and directories currently installed.)
 Preparing to replace libslang2 2.0.4-7 (using .../libslang2_2.0.5-1_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.5-1) ...
 
-(Reading database ... 11776 files and directories currently installed.)
+(Reading database ... 11795 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.13-1 (using .../passwd_1%3a4.0.13-6_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-6) ...
 
-(Reading database ... 11776 files and directories currently installed.)
+(Reading database ... 11795 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-5_all.deb) ...
+Unpacking replacement sysv-rc ...
+Setting up sysv-rc (2.86.ds1-5) ...
+
+(Reading database ... 11795 files and directories currently installed.)
 Preparing to replace zlib1g 1:1.2.3-4 (using .../zlib1g_1%3a1.2.3-6_amd64.deb) ...
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-6) ...
 
-(Reading database ... 11776 files and directories currently installed.)
+(Reading database ... 11795 files and directories currently installed.)
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Preparing to replace apt-utils 0.6.42.2 (using .../apt-utils_0.6.42.3_amd64.deb) ...
@@ -128,31 +201,30 @@ Preparing to replace libconsole 1:0.2.3dbs-57 (using .../libconsole_1%3a0.2.3dbs
 Unpacking replacement libconsole ...
 Preparing to replace cron 3.0pl1-91 (using .../cron_3.0pl1-92_amd64.deb) ...
 Unpacking replacement cron ...
-Preparing to replace manpages 2.02-2 (using .../manpages_2.03-1_all.deb) ...
+Preparing to replace libssl0.9.8 0.9.8a-3 (using .../libssl0.9.8_0.9.8a-4_amd64.deb) ...
+Unpacking replacement libssl0.9.8 ...
+Preparing to replace libtasn1-2 0.2.13-1 (using .../libtasn1-2_0.2.17-1_amd64.deb) ...
+Unpacking replacement libtasn1-2 ...
+Preparing to replace manpages 2.02-2 (using .../manpages_2.05-1_all.deb) ...
 Unpacking replacement manpages ...
 Preparing to replace nano 1.3.8-2 (using .../nano_1.3.9-1_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace tasksel 2.32 (using .../archives/tasksel_2.33_all.deb) ...
 Unpacking replacement tasksel ...
-Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
-Unpacking replacement libdb4.3 ...
 Preparing to replace makedev 2.3.1-78 (using .../makedev_2.3.1-79_all.deb) ...
 Unpacking replacement makedev ...
 Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace binutils 2.16.1-2 (using .../binutils_2.16.1cvs20050902-1_amd64.deb) ...
-Unpacking replacement binutils ...
-Preparing to replace exim4-config 4.54-1 (using .../exim4-config_4.54-2_all.deb) ...
-Unpacking replacement exim4-config ...
-Preparing to replace exim4-base 4.54-1 (using .../exim4-base_4.54-2_amd64.deb) ...
-Unpacking replacement exim4-base ...
-Preparing to replace exim4-daemon-light 4.54-1 (using .../exim4-daemon-light_4.54-2_amd64.deb) ...
-Unpacking replacement exim4-daemon-light ...
-Preparing to replace exim4 4.54-1 (using .../archives/exim4_4.54-2_all.deb) ...
-Unpacking replacement exim4 ...
+Preparing to replace libgnutls12 1.2.8-1 (using .../libgnutls12_1.2.9-1_amd64.deb) ...
+Unpacking replacement libgnutls12 ...
 Preparing to replace psmisc 21.6-1 (using .../psmisc_21.8-1_amd64.deb) ...
 Unpacking replacement psmisc ...
+Setting up libdb4.3 (4.3.29-1) ...
 Setting up libc6-dev (2.3.5-7) ...
+Setting up cpp-4.0 (4.0.2-3) ...
+Setting up binutils (2.16.1cvs20051109-1) ...
+
+Setting up gcc-4.0 (4.0.2-3) ...
 Setting up libdb4.2 (4.2.52-20) ...
 Setting up apt-utils (0.6.42.3) ...
 
@@ -167,10 +239,11 @@ Setting up libconsole (0.2.3dbs-58) ...
 Setting up cron (3.0pl1-92) ...
 Installing new version of config file /etc/init.d/cron ...
 
-Setting up manpages (2.03-1) ...
+Setting up libtasn1-2 (0.2.17-1) ...
+
+Setting up manpages (2.05-1) ...
 Setting up nano (1.3.9-1) ...
 
-Setting up libdb4.3 (4.3.29-1) ...
 Setting up makedev (2.3.1-79) ...
 Installing new version of config file /etc/init.d/makedev ...
 
@@ -178,31 +251,28 @@ Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
 
-Setting up binutils (2.16.1cvs20050902-1) ...
+Setting up libgnutls12 (1.2.9-1) ...
 
 Setting up psmisc (21.8-1) ...
 
 Setting up debconf-i18n (1.4.59) ...
+Setting up libstdc++6-4.0-dev (4.0.2-3) ...
+Setting up perl-modules (5.8.7-8) ...
 Setting up debconf (1.4.59) ...
 
+Setting up g++-4.0 (4.0.2-3) ...
 Setting up console-data (2002.12.04dbs-50) ...
 Looking for keymap to install:
 NONE
 
 Setting up console-tools (0.2.3dbs-58) ...
 
-Setting up tasksel (2.33) ...
-
-Setting up exim4-config (4.54-2) ...
-Installing new version of config file /etc/exim4/conf.d/router/200_exim4-config_primary ...
-Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
-Installing new version of config file /etc/exim4/exim4.conf.template ...
+Setting up libssl0.9.8 (0.9.8a-4) ...
 
-Setting up exim4-base (4.54-2) ...
+Setting up tasksel (2.33) ...
 
-Setting up exim4-daemon-light (4.54-2) ...
+Setting up perl (5.8.7-8) ...
 
-Setting up exim4 (4.54-2) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -212,6 +282,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//32209 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24787 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
index 54b6032..1aa7e0a 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//25856/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//17962/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,8 +18,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [120kB]
-Fetched 125kB in 0s (202kB/s)
+Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [125kB]
+Fetched 130kB in 0s (460kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -28,17 +28,31 @@ dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
+The following packages will be REMOVED:
+  aptitude tasksel
 The following packages will be upgraded:
-  diff
-1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/246kB of archives.
-After unpacking 303kB of additional disk space will be used.
+  apt apt-utils diff
+3 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0B/1713kB of archives.
+After unpacking 8729kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
-  diff
-(Reading database ... 12234 files and directories currently installed.)
+  diff apt-utils apt
+(Reading database ... 12246 files and directories currently installed.)
+Removing tasksel ...
+Removing aptitude ...
+(Reading database ... 12056 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
+(Reading database ... 12064 files and directories currently installed.)
+Preparing to replace apt-utils 0.6.42.3 (using .../apt-utils_0.6.42.3exp1_amd64.deb) ...
+Unpacking replacement apt-utils ...
+Preparing to replace apt 0.6.42.3 (using .../apt_0.6.42.3exp1_amd64.deb) ...
+Unpacking replacement apt ...
+Setting up apt (0.6.42.3exp1) ...
+
+Setting up apt-utils (0.6.42.3exp1) ...
+
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -48,6 +62,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25856 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//17962 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
index 774fa75..46860c4 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
@@ -1,20 +1,20 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//21966/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//14054/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
-Get:2 http://ftp.jp.debian.org sid Release [4800B]
+Get:2 http://ftp.jp.debian.org sid Release [5336B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3728kB]
-Fetched 3733kB in 2s (1600kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3738kB]
+Fetched 3744kB in 2s (1616kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -25,48 +25,51 @@ Building dependency tree...
 The following NEW packages will be installed:
   libsigc++-2.0-0c2
 The following packages will be upgraded:
-  apt apt-utils aptitude binutils console-data console-tools cpp-3.3 cron
-  debconf debconf-i18n debianutils exim4 exim4-base exim4-config
-  exim4-daemon-light g++-3.3 gcc-3.3 gcc-3.3-base grep libc6 libc6-dev
-  libconsole libdb4.2 libdb4.3 libncurses5 libncursesw5 libslang2 libstdc++5
-  libstdc++5-3.3-dev login makedev manpages module-init-tools nano
-  ncurses-base ncurses-bin passwd procps psmisc sed tasksel zlib1g
-42 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/28.3MB of archives.
-After unpacking 2556kB of additional disk space will be used.
+  apt apt-utils aptitude binutils console-data console-tools coreutils cpp-3.3
+  cpp-4.0 cron debconf debconf-i18n g++-3.3 g++-4.0 gcc-3.3 gcc-3.3-base
+  gcc-4.0 gcc-4.0-base grep initscripts libc6 libc6-dev libconsole libdb4.2
+  libdb4.3 libgcc1 libgnutls12 libncurses5 libncursesw5 libslang2 libssl0.9.8
+  libstdc++5 libstdc++5-3.3-dev libstdc++6 libstdc++6-4.0-dev libtasn1-2 login
+  makedev manpages nano ncurses-base ncurses-bin passwd perl perl-base
+  perl-modules procps psmisc sed sysv-rc sysvinit tasksel zlib1g
+53 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/46.0MB of archives.
+After unpacking 3478kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  debianutils grep login ncurses-bin sed libc6-dev libc6 libncurses5
-  ncurses-base debconf-i18n debconf apt libslang2 passwd zlib1g libdb4.2
-  apt-utils libncursesw5 libsigc++-2.0-0c2 aptitude console-data console-tools
-  libconsole cron manpages module-init-tools nano tasksel libdb4.3 makedev
-  procps binutils exim4-config exim4-base exim4-daemon-light exim4
-  gcc-3.3-base cpp-3.3 gcc-3.3 libstdc++5 libstdc++5-3.3-dev g++-3.3 psmisc
-(Reading database ... 12215 files and directories currently installed.)
-Preparing to replace debianutils 2.15 (using .../debianutils_2.15.1_amd64.deb) ...
-Unpacking replacement debianutils ...
-Setting up debianutils (2.15.1) ...
-
-(Reading database ... 12215 files and directories currently installed.)
+  coreutils grep login ncurses-bin perl-modules libc6-dev libc6 libdb4.3 perl
+  perl-base sed sysvinit libncurses5 ncurses-base debconf-i18n debconf libgcc1
+  libstdc++6-4.0-dev g++-4.0 gcc-4.0 cpp-4.0 binutils gcc-4.0-base libstdc++6
+  apt initscripts libslang2 passwd sysv-rc zlib1g libdb4.2 apt-utils
+  libncursesw5 libsigc++-2.0-0c2 aptitude console-data console-tools
+  libconsole cron libssl0.9.8 libtasn1-2 manpages nano tasksel makedev procps
+  libgnutls12 gcc-3.3-base cpp-3.3 gcc-3.3 libstdc++5 libstdc++5-3.3-dev
+  g++-3.3 psmisc
+Preconfiguring packages ...
+(Reading database ... 12206 files and directories currently installed.)
+Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-2_amd64.deb) ...
+Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
+Removing `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
+Unpacking replacement coreutils ...
+Setting up coreutils (5.93-2) ...
+
+(Reading database ... 12220 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds2-2 (using .../grep_2.5.1.ds2-4_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-4) ...
 
-(Reading database ... 12215 files and directories currently installed.)
+(Reading database ... 12220 files and directories currently installed.)
 Preparing to replace login 1:4.0.13-1 (using .../login_1%3a4.0.13-6_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-6) ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 12215 files and directories currently installed.)
+(Reading database ... 12220 files and directories currently installed.)
 Preparing to replace ncurses-bin 5.4-9 (using .../ncurses-bin_5.5-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.5-1) ...
-(Reading database ... 12215 files and directories currently installed.)
-Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
-Unpacking replacement sed ...
-Setting up sed (4.1.4-4) ...
-
-(Reading database ... 12216 files and directories currently installed.)
+(Reading database ... 12220 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.7-7 (using .../perl-modules_5.8.7-8_all.deb) ...
+Unpacking replacement perl-modules ...
 Preparing to replace libc6-dev 2.3.5-6 (using .../libc6-dev_2.3.5-7_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.5-6 (using .../libc6_2.3.5-7_amd64.deb) ...
@@ -74,44 +77,114 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-7) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 Current default timezone: 'UTC'.
-Local time is now:      Tue Nov 15 03:36:35 UTC 2005.
-Universal Time is now:  Tue Nov 15 03:36:35 UTC 2005.
+Local time is now:      Wed Nov 16 05:00:03 UTC 2005.
+Universal Time is now:  Wed Nov 16 05:00:03 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 12216 files and directories currently installed.)
+(Reading database ... 12220 files and directories currently installed.)
+Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
+Preparing to replace perl 5.8.7-7 (using .../perl_5.8.7-8_amd64.deb) ...
+Unpacking replacement perl ...
+Preparing to replace perl-base 5.8.7-7 (using .../perl-base_5.8.7-8_amd64.deb) ...
+Unpacking replacement perl-base ...
+Setting up perl-base (5.8.7-8) ...
+(Reading database ... 12218 files and directories currently installed.)
+Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.4-4) ...
+
+(Reading database ... 12219 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-5_amd64.deb) ...
+Unpacking replacement sysvinit ...
+Setting up sysvinit (2.86.ds1-5) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 12219 files and directories currently installed.)
 Preparing to replace libncurses5 5.4-9 (using .../libncurses5_5.5-1_amd64.deb) ...
 Unpacking replacement libncurses5 ...
 Setting up libncurses5 (5.5-1) ...
 
-(Reading database ... 12216 files and directories currently installed.)
+(Reading database ... 12219 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-9 (using .../ncurses-base_5.5-1_all.deb) ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.5-1) ...
-(Reading database ... 12216 files and directories currently installed.)
+(Reading database ... 12219 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.4.58 (using .../debconf-i18n_1.4.59_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.58 (using .../debconf_1.4.59_all.deb) ...
 Unpacking replacement debconf ...
+Preparing to replace libgcc1 1:4.0.2-2 (using .../libgcc1_1%3a4.0.2-3_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up libgcc1 (4.0.2-3) ...
+
+(Reading database ... 12222 files and directories currently installed.)
+Preparing to replace libstdc++6-4.0-dev 4.0.2-2 (using .../libstdc++6-4.0-dev_4.0.2-3_amd64.deb) ...
+Unpacking replacement libstdc++6-4.0-dev ...
+Preparing to replace g++-4.0 4.0.2-2 (using .../g++-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement g++-4.0 ...
+Preparing to replace gcc-4.0 4.0.2-2 (using .../gcc-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement gcc-4.0 ...
+Preparing to replace cpp-4.0 4.0.2-2 (using .../cpp-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement cpp-4.0 ...
+Preparing to replace binutils 2.16.1-2 (using .../binutils_2.16.1cvs20051109-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace gcc-4.0-base 4.0.2-2 (using .../gcc-4.0-base_4.0.2-3_amd64.deb) ...
+Unpacking replacement gcc-4.0-base ...
+Preparing to replace libstdc++6 4.0.2-2 (using .../libstdc++6_4.0.2-3_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up gcc-4.0-base (4.0.2-3) ...
+Setting up libstdc++6 (4.0.2-3) ...
+
+(Reading database ... 12232 files and directories currently installed.)
 Preparing to replace apt 0.6.42.2 (using .../apt_0.6.42.3_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.42.3) ...
 
-(Reading database ... 12219 files and directories currently installed.)
+(Reading database ... 12232 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-5_amd64.deb) ...
+Unpacking replacement initscripts ...
+Setting up initscripts (2.86.ds1-5) ...
+Installing new version of config file /etc/init.d/bootclean.sh ...
+Installing new version of config file /etc/init.d/bootlogd ...
+Installing new version of config file /etc/init.d/bootmisc.sh ...
+Installing new version of config file /etc/init.d/checkfs.sh ...
+Installing new version of config file /etc/init.d/checkroot.sh ...
+Installing new version of config file /etc/init.d/halt ...
+Installing new version of config file /etc/init.d/hostname.sh ...
+Installing new version of config file /etc/init.d/mountall.sh ...
+Installing new version of config file /etc/init.d/mountnfs.sh ...
+Installing new version of config file /etc/init.d/mountvirtfs ...
+Installing new version of config file /etc/init.d/reboot ...
+Installing new version of config file /etc/init.d/rmnologin ...
+Installing new version of config file /etc/init.d/sendsigs ...
+Installing new version of config file /etc/init.d/single ...
+Installing new version of config file /etc/init.d/umountfs ...
+Installing new version of config file /etc/init.d/umountnfs.sh ...
+Installing new version of config file /etc/init.d/umountroot ...
+Installing new version of config file /etc/init.d/urandom ...
+
+(Reading database ... 12232 files and directories currently installed.)
 Preparing to replace libslang2 2.0.4-7 (using .../libslang2_2.0.5-1_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.5-1) ...
 
-(Reading database ... 12219 files and directories currently installed.)
+(Reading database ... 12232 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.13-1 (using .../passwd_1%3a4.0.13-6_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-6) ...
 
-(Reading database ... 12219 files and directories currently installed.)
+(Reading database ... 12232 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-5_all.deb) ...
+Unpacking replacement sysv-rc ...
+Setting up sysv-rc (2.86.ds1-5) ...
+
+(Reading database ... 12232 files and directories currently installed.)
 Preparing to replace zlib1g 1:1.2.3-4 (using .../zlib1g_1%3a1.2.3-6_amd64.deb) ...
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-6) ...
 
-(Reading database ... 12219 files and directories currently installed.)
+(Reading database ... 12232 files and directories currently installed.)
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Preparing to replace apt-utils 0.6.42.2 (using .../apt-utils_0.6.42.3_amd64.deb) ...
@@ -130,30 +203,22 @@ Preparing to replace libconsole 1:0.2.3dbs-57 (using .../libconsole_1%3a0.2.3dbs
 Unpacking replacement libconsole ...
 Preparing to replace cron 3.0pl1-91 (using .../cron_3.0pl1-92_amd64.deb) ...
 Unpacking replacement cron ...
-Preparing to replace manpages 2.02-2 (using .../manpages_2.03-1_all.deb) ...
+Preparing to replace libssl0.9.8 0.9.8a-3 (using .../libssl0.9.8_0.9.8a-4_amd64.deb) ...
+Unpacking replacement libssl0.9.8 ...
+Preparing to replace libtasn1-2 0.2.13-1 (using .../libtasn1-2_0.2.17-1_amd64.deb) ...
+Unpacking replacement libtasn1-2 ...
+Preparing to replace manpages 2.02-2 (using .../manpages_2.05-1_all.deb) ...
 Unpacking replacement manpages ...
-Preparing to replace module-init-tools 3.2-pre9-2 (using .../module-init-tools_3.2-pre9-4_amd64.deb) ...
-Unpacking replacement module-init-tools ...
 Preparing to replace nano 1.3.8-2 (using .../nano_1.3.9-1_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace tasksel 2.32 (using .../archives/tasksel_2.33_all.deb) ...
 Unpacking replacement tasksel ...
-Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
-Unpacking replacement libdb4.3 ...
 Preparing to replace makedev 2.3.1-78 (using .../makedev_2.3.1-79_all.deb) ...
 Unpacking replacement makedev ...
 Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace binutils 2.16.1-2 (using .../binutils_2.16.1cvs20050902-1_amd64.deb) ...
-Unpacking replacement binutils ...
-Preparing to replace exim4-config 4.54-1 (using .../exim4-config_4.54-2_all.deb) ...
-Unpacking replacement exim4-config ...
-Preparing to replace exim4-base 4.54-1 (using .../exim4-base_4.54-2_amd64.deb) ...
-Unpacking replacement exim4-base ...
-Preparing to replace exim4-daemon-light 4.54-1 (using .../exim4-daemon-light_4.54-2_amd64.deb) ...
-Unpacking replacement exim4-daemon-light ...
-Preparing to replace exim4 4.54-1 (using .../archives/exim4_4.54-2_all.deb) ...
-Unpacking replacement exim4 ...
+Preparing to replace libgnutls12 1.2.8-1 (using .../libgnutls12_1.2.9-1_amd64.deb) ...
+Unpacking replacement libgnutls12 ...
 Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3-base ...
 Preparing to replace cpp-3.3 1:3.3.6-7 (using .../cpp-3.3_1%3a3.3.6-10_amd64.deb) ...
@@ -168,7 +233,12 @@ Preparing to replace g++-3.3 1:3.3.6-7 (using .../g++-3.3_1%3a3.3.6-10_amd64.deb
 Unpacking replacement g++-3.3 ...
 Preparing to replace psmisc 21.6-1 (using .../psmisc_21.8-1_amd64.deb) ...
 Unpacking replacement psmisc ...
+Setting up libdb4.3 (4.3.29-1) ...
 Setting up libc6-dev (2.3.5-7) ...
+Setting up cpp-4.0 (4.0.2-3) ...
+Setting up binutils (2.16.1cvs20051109-1) ...
+
+Setting up gcc-4.0 (4.0.2-3) ...
 Setting up libdb4.2 (4.2.52-20) ...
 Setting up apt-utils (0.6.42.3) ...
 
@@ -183,13 +253,11 @@ Setting up libconsole (0.2.3dbs-58) ...
 Setting up cron (3.0pl1-92) ...
 Installing new version of config file /etc/init.d/cron ...
 
-Setting up manpages (2.03-1) ...
-Setting up module-init-tools (3.2-pre9-4) ...
-Installing new version of config file /etc/init.d/module-init-tools ...
+Setting up libtasn1-2 (0.2.17-1) ...
 
+Setting up manpages (2.05-1) ...
 Setting up nano (1.3.9-1) ...
 
-Setting up libdb4.3 (4.3.29-1) ...
 Setting up makedev (2.3.1-79) ...
 Installing new version of config file /etc/init.d/makedev ...
 
@@ -197,7 +265,7 @@ Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
 
-Setting up binutils (2.16.1cvs20050902-1) ...
+Setting up libgnutls12 (1.2.9-1) ...
 
 Setting up gcc-3.3-base (3.3.6-10) ...
 Setting up cpp-3.3 (3.3.6-10) ...
@@ -206,29 +274,26 @@ Setting up libstdc++5 (3.3.6-10) ...
 
 Setting up psmisc (21.8-1) ...
 
-Setting up libstdc++5-3.3-dev (3.3.6-10) ...
 Setting up debconf-i18n (1.4.59) ...
-Setting up g++-3.3 (3.3.6-10) ...
+Setting up libstdc++6-4.0-dev (4.0.2-3) ...
+Setting up libstdc++5-3.3-dev (3.3.6-10) ...
+Setting up perl-modules (5.8.7-8) ...
 Setting up debconf (1.4.59) ...
 
+Setting up g++-4.0 (4.0.2-3) ...
 Setting up console-data (2002.12.04dbs-50) ...
 Looking for keymap to install:
 NONE
 
 Setting up console-tools (0.2.3dbs-58) ...
 
-Setting up tasksel (2.33) ...
-
-Setting up exim4-config (4.54-2) ...
-Installing new version of config file /etc/exim4/conf.d/router/200_exim4-config_primary ...
-Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
-Installing new version of config file /etc/exim4/exim4.conf.template ...
+Setting up libssl0.9.8 (0.9.8a-4) ...
 
-Setting up exim4-base (4.54-2) ...
+Setting up tasksel (2.33) ...
 
-Setting up exim4-daemon-light (4.54-2) ...
+Setting up g++-3.3 (3.3.6-10) ...
+Setting up perl (5.8.7-8) ...
 
-Setting up exim4 (4.54-2) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -238,6 +303,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//21966 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14054 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
index e443aba..164414d 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
@@ -1,18 +1,18 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//16475/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//8272/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3441kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3448kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3441kB in 1s (1837kB/s)
+Fetched 3449kB in 1s (1779kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -41,6 +41,7 @@ The following packages will be upgraded:
   ncurses-bin net-tools netbase netkit-inetd passwd perl perl-base perl-modules
   procps psmisc sysv-rc sysvinit tar tasksel telnet util-linux wget whiptail
   zlib1g
+Preconfiguring packages ...
 111 upgraded, 17 newly installed, 1 to remove and 0 not upgraded.
 Need to get 0B/60.2MB of archives.
 After unpacking 33.5MB of additional disk space will be used.
@@ -74,8 +75,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-6) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Tue Nov 15 03:34:48 UTC 2005.
-Universal Time is now:  Tue Nov 15 03:34:48 UTC 2005.
+Local time is now:      Wed Nov 16 04:58:13 UTC 2005.
+Universal Time is now:  Wed Nov 16 04:58:13 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11064 files and directories currently installed.)
@@ -128,10 +129,10 @@ Installing new version of config file /etc/issue.net ...
 Installing new version of config file /etc/nsswitch.conf ...
 
 (Reading database ... 11074 files and directories currently installed.)
-Preparing to replace debianutils 2.8.4 (using .../debianutils_2.15_amd64.deb) ...
+Preparing to replace debianutils 2.8.4 (using .../debianutils_2.15.1_amd64.deb) ...
 Unpacking replacement debianutils ...
 Replacing files in old package passwd ...
-Setting up debianutils (2.15) ...
+Setting up debianutils (2.15.1) ...
 
 (Reading database ... 11085 files and directories currently installed.)
 Preparing to replace libgpg-error0 1.0-1 (using .../libgpg-error0_1.1-4_amd64.deb) ...
@@ -153,7 +154,7 @@ Selecting previously deselected package libgnutls12.
 Unpacking libgnutls12 (from .../libgnutls12_1.2.8-1_amd64.deb) ...
 Preparing to replace libpcre3 4.5-1.2 (using .../libpcre3_6.4-1_amd64.deb) ...
 Unpacking replacement libpcre3 ...
-Preparing to replace exim4-daemon-light 4.50-8 (using .../exim4-daemon-light_4.54-1_amd64.deb) ...
+Preparing to replace exim4-daemon-light 4.50-8 (using .../exim4-daemon-light_4.54-2_amd64.deb) ...
 Unpacking replacement exim4-daemon-light ...
 Selecting previously deselected package libselinux1.
 Unpacking libselinux1 (from .../libselinux1_1.26-1_amd64.deb) ...
@@ -195,13 +196,13 @@ Preparing to replace adduser 3.63 (using .../archives/adduser_3.77_all.deb) ...
 Unpacking replacement adduser ...
 Preparing to replace cron 3.0pl1-86 (using .../cron_3.0pl1-91_amd64.deb) ...
 Unpacking replacement cron ...
-Preparing to replace exim4-config 4.50-8 (using .../exim4-config_4.54-1_all.deb) ...
+Preparing to replace exim4-config 4.50-8 (using .../exim4-config_4.54-2_all.deb) ...
 Unpacking replacement exim4-config ...
 Preparing to replace ncurses-bin 5.4-4 (using .../ncurses-bin_5.4-9_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.4-9) ...
 Selecting previously deselected package lsb-base.
-(Reading database ... 11636 files and directories currently installed.)
+(Reading database ... 11635 files and directories currently installed.)
 Unpacking lsb-base (from .../lsb-base_3.0-11_all.deb) ...
 Preparing to replace netkit-inetd 0.10-10 (using .../netkit-inetd_0.10-10.2_amd64.deb) ...
 Unpacking replacement netkit-inetd ...
@@ -209,7 +210,7 @@ Preparing to replace iputils-ping 3:20020927-2 (using .../iputils-ping_3%3a20020
 Unpacking replacement iputils-ping ...
 Preparing to replace netbase 4.21 (using .../archives/netbase_4.23_all.deb) ...
 Unpacking replacement netbase ...
-Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.54-1_amd64.deb) ...
+Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.54-2_amd64.deb) ...
 Unpacking replacement exim4-base ...
 Selecting previously deselected package libdb4.3.
 Unpacking libdb4.3 (from .../libdb4.3_4.3.28-2_amd64.deb) ...
@@ -221,7 +222,7 @@ Installing new version of config file /etc/security/access.conf ...
 Installing new version of config file /etc/security/pam_env.conf ...
 Installing new version of config file /etc/security/limits.conf ...
 
-(Reading database ... 11654 files and directories currently installed.)
+(Reading database ... 11651 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.13-1_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-1) ...
@@ -229,14 +230,14 @@ Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11663 files and directories currently installed.)
+(Reading database ... 11660 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.3-31sarge5 (using .../passwd_1%3a4.0.13-1_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-1) ...
 Installing new version of config file /etc/pam.d/chfn ...
 Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 11689 files and directories currently installed.)
+(Reading database ... 11686 files and directories currently installed.)
 Preparing to replace bash 2.05b-26 (using .../archives/bash_3.0-17_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.0-17) ...
@@ -245,17 +246,17 @@ Installing new version of config file /etc/skel/.bash_profile ...
 Installing new version of config file /etc/bash.bashrc ...
 Installing new version of config file /etc/bash_completion ...
 
-(Reading database ... 11693 files and directories currently installed.)
+(Reading database ... 11690 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12p-8) ...
 
-(Reading database ... 11693 files and directories currently installed.)
+(Reading database ... 11690 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2 (using .../coreutils_5.2.1-2.1_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (5.2.1-2.1) ...
 
-(Reading database ... 11692 files and directories currently installed.)
+(Reading database ... 11689 files and directories currently installed.)
 Preparing to replace dpkg 1.10.28 (using .../dpkg_1.13.11_amd64.deb) ...
 Unpacking replacement dpkg ...
 Setting up dpkg (1.13.11) ...
@@ -269,69 +270,69 @@ Installing new version of config file /etc/dpkg/origins/debian ...
 Adding `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Adding `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 
-(Reading database ... 11691 files and directories currently installed.)
+(Reading database ... 11688 files and directories currently installed.)
 Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38-2_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.38-2) ...
 
-(Reading database ... 11691 files and directories currently installed.)
+(Reading database ... 11688 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38-2_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.38-2) ...
-(Reading database ... 11695 files and directories currently installed.)
+(Reading database ... 11692 files and directories currently installed.)
 Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.25-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.25-1) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11715 files and directories currently installed.)
+(Reading database ... 11712 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds1-4 (using .../grep_2.5.1.ds2-2_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-2) ...
 
-(Reading database ... 11714 files and directories currently installed.)
+(Reading database ... 11711 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-10 (using .../gzip_1.3.5-12_amd64.deb) ...
 Unpacking replacement gzip ...
 Setting up gzip (1.3.5-12) ...
 
-(Reading database ... 11714 files and directories currently installed.)
+(Reading database ... 11711 files and directories currently installed.)
 Preparing to replace hostname 2.13 (using .../hostname_2.91_amd64.deb) ...
 Unpacking replacement hostname ...
 Setting up hostname (2.91) ...
-(Reading database ... 11714 files and directories currently installed.)
+(Reading database ... 11711 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12p-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12p-8) ...
 
 Selecting previously deselected package libsepol1.
-(Reading database ... 11714 files and directories currently installed.)
+(Reading database ... 11711 files and directories currently installed.)
 Unpacking libsepol1 (from .../libsepol1_1.8-1_amd64.deb) ...
 Setting up libsepol1 (1.8-1) ...
 
-(Reading database ... 11719 files and directories currently installed.)
+(Reading database ... 11716 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-4) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11719 files and directories currently installed.)
+(Reading database ... 11716 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-2_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
 Selecting previously deselected package libslang2.
-(Reading database ... 11723 files and directories currently installed.)
+(Reading database ... 11720 files and directories currently installed.)
 Unpacking libslang2 (from .../libslang2_2.0.4-7_amd64.deb) ...
 Setting up libslang2 (2.0.4-7) ...
 
-(Reading database ... 11735 files and directories currently installed.)
+(Reading database ... 11732 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12p-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11735 files and directories currently installed.)
+(Reading database ... 11732 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-4 (using .../ncurses-base_5.4-9_all.deb) ...
 Removing obsolete conffile /etc/terminfo/E/Eterm ...
 Removing obsolete conffile /etc/terminfo/E/Eterm-color ...
@@ -369,7 +370,7 @@ Removing obsolete conffile /etc/terminfo/x/xterm-vt220 ...
 Removing obsolete conffile /etc/terminfo/x/xterm-color ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.4-9) ...
-(Reading database ... 11739 files and directories currently installed.)
+(Reading database ... 11736 files and directories currently installed.)
 Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-57_amd64.deb) ...
 Unpacking replacement console-tools ...
 Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-57_amd64.deb) ...
@@ -381,14 +382,14 @@ Setting up libtext-wrapi18n-perl (0.06-4) ...
 Setting up debconf-i18n (1.4.58) ...
 Setting up debconf (1.4.58) ...
 
-(Reading database ... 11739 files and directories currently installed.)
+(Reading database ... 11736 files and directories currently installed.)
 Preparing to replace console-common 0.7.49 (using .../console-common_0.7.54_all.deb) ...
 Unpacking replacement console-common ...
 Preparing to replace dselect 1.10.28 (using .../dselect_1.13.11_amd64.deb) ...
 Unpacking replacement dselect ...
 Setting up dselect (1.13.11) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 11744 files and directories currently installed.)
+(Reading database ... 11741 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement initscripts ...
 Setting up lsb-base (3.0-11) ...
@@ -412,7 +413,7 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/urandom ...
 Installing new version of config file /etc/default/tmpfs ...
 
-(Reading database ... 11745 files and directories currently installed.)
+(Reading database ... 11742 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.25-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.32-1_amd64.deb) ...
@@ -421,32 +422,32 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.32-1) ...
 
-(Reading database ... 11745 files and directories currently installed.)
+(Reading database ... 11742 files and directories currently installed.)
 Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38-2_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38-2) ...
 
-(Reading database ... 11745 files and directories currently installed.)
+(Reading database ... 11742 files and directories currently installed.)
 Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38-2_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38-2) ...
 
-(Reading database ... 11745 files and directories currently installed.)
+(Reading database ... 11742 files and directories currently installed.)
 Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38-2_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38-2) ...
 
-(Reading database ... 11745 files and directories currently installed.)
+(Reading database ... 11742 files and directories currently installed.)
 Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38-2_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38-2) ...
 
-(Reading database ... 11745 files and directories currently installed.)
+(Reading database ... 11742 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-4_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-4) ...
 
-(Reading database ... 11745 files and directories currently installed.)
+(Reading database ... 11742 files and directories currently installed.)
 Preparing to replace binutils 2.15-6 (using .../binutils_2.16.1-2_amd64.deb) ...
 Unpacking replacement binutils ...
 Preparing to replace libstdc++5-3.3-dev 1:3.3.5-13 (using .../libstdc++5-3.3-dev_1%3a3.3.6-7_amd64.deb) ...
@@ -465,7 +466,7 @@ Setting up gcc-3.3-base (3.3.6-7) ...
 Setting up libstdc++5 (3.3.6-7) ...
 
 Selecting previously deselected package dmidecode.
-(Reading database ... 11753 files and directories currently installed.)
+(Reading database ... 11750 files and directories currently installed.)
 Unpacking dmidecode (from .../dmidecode_2.7-2_amd64.deb) ...
 Selecting previously deselected package laptop-detect.
 Unpacking laptop-detect (from .../laptop-detect_0.12.1_amd64.deb) ...
@@ -497,7 +498,7 @@ Preparing to replace man-db 2.4.2-21 (using .../man-db_2.4.3-3_amd64.deb) ...
 Unpacking replacement man-db ...
 Preparing to replace manpages 1.70-1 (using .../manpages_2.02-2_all.deb) ...
 Unpacking replacement manpages ...
-Preparing to replace module-init-tools 3.2-pre1-2 (using .../module-init-tools_3.2-pre9-2_amd64.deb) ...
+Preparing to replace module-init-tools 3.2-pre1-2 (using .../module-init-tools_3.2-pre9-4_amd64.deb) ...
 Unpacking replacement module-init-tools ...
 Preparing to replace modutils 2.4.26-1.2 (using .../modutils_2.4.27.0-3_amd64.deb) ...
 Unpacking replacement modutils ...
@@ -528,7 +529,7 @@ Preparing to replace make 3.80-9 (using .../make_3.80-11_amd64.deb) ...
 Unpacking replacement make ...
 Preparing to replace dpkg-dev 1.10.28 (using .../dpkg-dev_1.13.11_all.deb) ...
 Unpacking replacement dpkg-dev ...
-Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.54-1_all.deb) ...
+Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.54-2_all.deb) ...
 Unpacking replacement exim4 ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-2_amd64.deb) ...
@@ -583,10 +584,11 @@ Setting up cron (3.0pl1-91) ...
 Installing new version of config file /etc/cron.daily/standard ...
 Installing new version of config file /etc/pam.d/cron ...
 
-Setting up exim4-config (4.54-1) ...
+Setting up exim4-config (4.54-2) ...
 Installing new version of config file /etc/exim4/conf.d/acl/30_exim4-config_check_rcpt ...
 Installing new version of config file /etc/exim4/conf.d/router/150_exim4-config_hubbed_hosts ...
 Installing new version of config file /etc/exim4/conf.d/router/300_exim4-config_real_local ...
+Installing new version of config file /etc/exim4/conf.d/router/200_exim4-config_primary ...
 Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
 Installing new version of config file /etc/exim4/conf.d/rewrite/31_exim4-config_rewriting ...
 Installing new version of config file /etc/exim4/conf.d/main/03_exim4-config_tlsoptions ...
@@ -602,11 +604,11 @@ Installing new version of config file /etc/protocols ...
 Installing new version of config file /etc/init.d/networking ...
 Installing new version of config file /etc/services ...
 
-Setting up exim4-base (4.54-1) ...
+Setting up exim4-base (4.54-2) ...
 Installing new version of config file /etc/cron.daily/exim4-base ...
 Installing new version of config file /etc/init.d/exim4 ...
 
-Setting up exim4-daemon-light (4.54-1) ...
+Setting up exim4-daemon-light (4.54-2) ...
 
 Setting up libconsole (0.2.3dbs-57) ...
 
@@ -641,9 +643,9 @@ Setting up man-db (2.4.3-3) ...
 Installing new version of config file /etc/manpath.config ...
 
 Setting up manpages (2.02-2) ...
-Setting up module-init-tools (3.2-pre9-2) ...
-Installing new version of config file /etc/modprobe.d/aliases ...
+Setting up module-init-tools (3.2-pre9-4) ...
 Installing new version of config file /etc/init.d/module-init-tools ...
+Installing new version of config file /etc/modprobe.d/aliases ...
 
 Setting up modutils (2.4.27.0-3) ...
 Installing new version of config file /etc/init.d/modutils ...
@@ -676,7 +678,7 @@ Setting up cpp-4.0 (4.0.2-2) ...
 Setting up cpp (4.0.2-1) ...
 Setting up make (3.80-11) ...
 
-Setting up exim4 (4.54-1) ...
+Setting up exim4 (4.54-2) ...
 Setting up gcc-4.0 (4.0.2-2) ...
 Setting up gcc (4.0.2-1) ...
 
@@ -725,6 +727,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//16475 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//8272 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index d7288ee..e1e4a35 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/24671/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/17128/etc/mtab': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -26,7 +26,7 @@ After unpacking 737kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libdebian-installer4 libdebian-installer-extra4 cdebootstrap pbuilder
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11772 files and directories currently installed.)
+(Reading database ... 11769 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.35_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.35_amd64.deb) ...
@@ -64,7 +64,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11865 files and directories currently installed.)
+(Reading database ... 11862 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -105,14 +105,14 @@ Building dependency tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/94.1kB of archives.
+Need to get 0B/94.3kB of archives.
 After unpacking 360kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 12456 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.5.4_amd64.deb) ...
-Setting up fakeroot (1.5.4) ...
+(Reading database ... 12453 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
+Setting up fakeroot (1.5.5) ...
 
 dpkg-buildpackage: source package is dsh
 dpkg-buildpackage: source version is 0.25.6-1
@@ -123,14 +123,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -318,18 +318,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -342,26 +342,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -397,10 +397,10 @@ success
 success
 success
 success
-b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -412,7 +412,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:43:45 UTC 2005
+Wed Nov 16 05:07:25 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,14 +482,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:43:50 UTC 2005
+Wed Nov 16 05:07:30 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -498,9 +498,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -508,58 +508,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -583,6 +583,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/24671 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/17128 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sarge.log b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
index 9f94675..b6b8d62 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sarge.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/8959/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/503/etc/mtab': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -110,14 +110,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -305,18 +305,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -329,26 +329,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -384,10 +384,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -399,7 +399,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:33:26 UTC 2005
+Wed Nov 16 04:56:47 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -469,14 +469,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:33:31 UTC 2005
+Wed Nov 16 04:56:52 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -485,9 +485,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -495,58 +495,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -570,6 +570,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/8959 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/503 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index 3d062e6..79a4cb2 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/2869/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/26629/etc/mtab': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -26,16 +26,16 @@ After unpacking 741kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libdebian-installer4 libdebian-installer-extra4 cdebootstrap pbuilder
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11780 files and directories currently installed.)
-Unpacking libdebian-installer4 (from .../libdebian-installer4_0.35_amd64.deb) ...
+(Reading database ... 11792 files and directories currently installed.)
+Unpacking libdebian-installer4 (from .../libdebian-installer4_0.36_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
-Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.35_amd64.deb) ...
+Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.36_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.3.9_amd64.deb) ...
 Selecting previously deselected package pbuilder.
 Unpacking pbuilder (from .../pbuilder_0.138_all.deb) ...
-Setting up libdebian-installer4 (0.35) ...
-Setting up libdebian-installer-extra4 (0.35) ...
+Setting up libdebian-installer4 (0.36) ...
+Setting up libdebian-installer-extra4 (0.36) ...
 Setting up cdebootstrap (0.3.9) ...
 Setting up pbuilder (0.138) ...
 Setting DEBBUILDOPTS=
@@ -64,7 +64,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11874 files and directories currently installed.)
+(Reading database ... 11886 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -79,7 +79,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.0_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.6_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.7_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -95,7 +95,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.0) ...
-Setting up debhelper (5.0.6) ...
+Setting up debhelper (5.0.7) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -110,7 +110,7 @@ After unpacking 360kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 12465 files and directories currently installed.)
+(Reading database ... 12477 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
@@ -123,14 +123,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -319,18 +319,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -343,26 +343,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -413,7 +413,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:27:41 UTC 2005
+Wed Nov 16 04:50:25 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -483,7 +483,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:27:46 UTC 2005
+Wed Nov 16 04:50:30 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -499,9 +499,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -511,58 +511,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -600,6 +600,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/2869 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/26629 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index 6c99c91..aafc1e0 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-etch.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -30,14 +30,14 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:41:54 JST 2005
-pbuilder-time-stamp: 1132026114
+Current time: Wed Nov 16 14:05:32 JST 2005
+pbuilder-time-stamp: 1132117532
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/17694/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/10055/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -68,7 +68,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11772 files and directories currently installed.)
+(Reading database ... 11769 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -105,7 +105,6 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/17694/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -389,6 +388,7 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
+dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -427,7 +427,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:42:42 UTC 2005
+Wed Nov 16 05:06:25 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -497,7 +497,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:42:47 UTC 2005
+Wed Nov 16 05:06:30 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -610,7 +610,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:42:49 JST 2005
-pbuilder-time-stamp: 1132026169
+Current time: Wed Nov 16 14:06:32 JST 2005
+pbuilder-time-stamp: 1132117592
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/17694 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/10055 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sarge.log b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
index ecc4ef8..cbc64a7 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sarge.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -30,14 +30,14 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:31:44 JST 2005
-pbuilder-time-stamp: 1132025504
+Current time: Wed Nov 16 13:54:52 JST 2005
+pbuilder-time-stamp: 1132116892
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/1862/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/25917/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -102,7 +102,6 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/1862/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -409,9 +408,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -423,7 +422,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:32:31 UTC 2005
+Wed Nov 16 04:55:41 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -493,14 +492,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:32:36 UTC 2005
+Wed Nov 16 04:55:46 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -606,7 +605,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:32:38 JST 2005
-pbuilder-time-stamp: 1132025558
+Current time: Wed Nov 16 13:55:48 JST 2005
+pbuilder-time-stamp: 1132116948
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/1862 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/25917 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index 5934b9e..1f810d9 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sid.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -30,14 +30,14 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:25:58 JST 2005
-pbuilder-time-stamp: 1132025158
+Current time: Wed Nov 16 13:48:16 JST 2005
+pbuilder-time-stamp: 1132116496
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/28358/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/18741/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -68,7 +68,7 @@ WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11780 files and directories currently installed.)
+(Reading database ... 11792 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -83,7 +83,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.0_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.6_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.7_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -99,13 +99,12 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.0) ...
-Setting up debhelper (5.0.6) ...
+Setting up debhelper (5.0.7) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/28358/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -390,7 +389,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -414,10 +412,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -429,7 +427,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:26:42 UTC 2005
+Wed Nov 16 04:49:16 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -499,14 +497,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:26:47 UTC 2005
+Wed Nov 16 04:49:21 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
-c: c
 dsh: Process terminated (before write).
-a: a
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -628,7 +626,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:26:49 JST 2005
-pbuilder-time-stamp: 1132025209
+Current time: Wed Nov 16 13:49:23 JST 2005
+pbuilder-time-stamp: 1132116563
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/28358 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/18741 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 67e9bb6..90e0593 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -1,14 +1,14 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:16:55 JST 2005
-pbuilder-time-stamp: 1132024615
+Current time: Wed Nov 16 13:38:44 JST 2005
+pbuilder-time-stamp: 1132115924
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/8772/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/30679/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -36,7 +36,7 @@ The following NEW packages will be installed:
 Need to get 0B/2890kB of archives.
 After unpacking 9572kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11821 files and directories currently installed.)
+(Reading database ... 11815 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -73,11 +73,10 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/8772/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -380,8 +379,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -393,7 +392,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:17:40 UTC 2005
+Wed Nov 16 04:39:32 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -463,14 +462,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:17:45 UTC 2005
+Wed Nov 16 04:39:37 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -576,7 +575,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:17:47 JST 2005
-pbuilder-time-stamp: 1132024667
+Current time: Wed Nov 16 13:39:39 JST 2005
+pbuilder-time-stamp: 1132115979
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/8772 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/30679 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sarge.log b/testsuite/normal/pbuilder-build-dsh-sarge.log
index df0e5d9..7a3e00d 100644
--- a/testsuite/normal/pbuilder-build-dsh-sarge.log
+++ b/testsuite/normal/pbuilder-build-dsh-sarge.log
@@ -1,14 +1,14 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:07:50 JST 2005
-pbuilder-time-stamp: 1132024070
+Current time: Wed Nov 16 13:29:06 JST 2005
+pbuilder-time-stamp: 1132115346
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/32377/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/21142/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -73,11 +73,10 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/32377/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -377,8 +376,8 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -391,7 +390,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:08:27 UTC 2005
+Wed Nov 16 04:29:51 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -461,14 +460,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:08:32 UTC 2005
+Wed Nov 16 04:29:56 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 b: b
-c: c
 dsh: Process terminated (before write).
 a: a
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -574,7 +573,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:08:35 JST 2005
-pbuilder-time-stamp: 1132024115
+Current time: Wed Nov 16 13:29:58 JST 2005
+pbuilder-time-stamp: 1132115398
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/32377 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/21142 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index ecb833f..8279e9f 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -1,14 +1,14 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:02:26 JST 2005
-pbuilder-time-stamp: 1132023746
+Current time: Wed Nov 16 13:17:12 JST 2005
+pbuilder-time-stamp: 1132114632
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/32231/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/820/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -36,7 +36,7 @@ The following NEW packages will be installed:
 Need to get 0B/2892kB of archives.
 After unpacking 9572kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11831 files and directories currently installed.)
+(Reading database ... 11858 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -51,7 +51,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.0_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.6_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.7_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -67,17 +67,16 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.0) ...
-Setting up debhelper (5.0.6) ...
+Setting up debhelper (5.0.7) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/32231/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -379,10 +378,10 @@ success
 success
 success
 success
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -394,7 +393,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:03:09 UTC 2005
+Wed Nov 16 04:19:08 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -464,14 +463,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:03:14 UTC 2005
+Wed Nov 16 04:19:13 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -593,7 +592,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:03:16 JST 2005
-pbuilder-time-stamp: 1132023796
+Current time: Wed Nov 16 13:19:23 JST 2005
+pbuilder-time-stamp: 1132114763
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir1/32231 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir1/820 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 7c735c5..792e71d 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -560,13 +560,13 @@ I: Base system installed successfully.
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//31235/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//20756/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
 Hit http://ftp.jp.debian.org etch Release
 Hit http://ftp.jp.debian.org etch/main Packages
-Fetched 189B in 0s (2218B/s)
+Fetched 189B in 0s (2394B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -594,7 +594,7 @@ The following NEW packages will be installed:
 Need to get 0B/20.4MB of archives.
 After unpacking 81.7MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 7471 files and directories currently installed.)
+(Reading database ... 7465 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1-2_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-2_amd64.deb) ...
@@ -650,6 +650,6 @@ Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31235 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//20756 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sarge.log b/testsuite/normal/pbuilder-create-sarge.log
index 1b1122f..75a5046 100644
--- a/testsuite/normal/pbuilder-create-sarge.log
+++ b/testsuite/normal/pbuilder-create-sarge.log
@@ -324,12 +324,12 @@ I: Base system installed successfully.
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//21594/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//1443/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Hit http://ftp.jp.debian.org sarge/main Packages
 Get:1 http://ftp.jp.debian.org sarge/main Release [110B]
-Fetched 110B in 0s (1916B/s)
+Fetched 110B in 0s (3354B/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -412,6 +412,6 @@ Setting up build-essential (10.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//21594 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//1443 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 80086a0..18118f8 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -169,6 +169,8 @@ I: Retrieving libstdc++6
 I: Validating libstdc++6
 I: Retrieving libtasn1-2
 I: Validating libtasn1-2
+I: Retrieving libtasn1-2-bin
+I: Validating libtasn1-2-bin
 I: Retrieving libtext-charwidth-perl
 I: Validating libtext-charwidth-perl
 I: Retrieving libtext-iconv-perl
@@ -471,6 +473,7 @@ I: Unpacking libsigc++-1.2-5c2...
 I: Unpacking libsigc++-2.0-0c2...
 I: Unpacking libssl0.9.8...
 I: Unpacking libtasn1-2...
+I: Unpacking libtasn1-2-bin...
 I: Unpacking libusb-0.1-4...
 I: Unpacking libwrap0...
 I: Unpacking logrotate...
@@ -510,6 +513,7 @@ I: Configuring modutils...
 I: Configuring traceroute...
 I: Configuring manpages...
 I: Configuring ed...
+I: Configuring libtasn1-2-bin...
 I: Configuring liblzo1...
 I: Configuring wget...
 I: Configuring groff-base...
@@ -560,13 +564,13 @@ I: Base system installed successfully.
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//22353/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//16046/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 189B in 0s (2818B/s)
+Fetched 189B in 0s (1032B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -591,19 +595,19 @@ The following NEW packages will be installed:
   libc6-dev libstdc++6-4.0-dev linux-kernel-headers make patch perl
   perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/20.6MB of archives.
-After unpacking 82.1MB of additional disk space will be used.
+Need to get 0B/20.7MB of archives.
+After unpacking 82.3MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 7473 files and directories currently installed.)
-Unpacking binutils (from .../binutils_2.16.1cvs20050902-1_amd64.deb) ...
+(Reading database ... 7500 files and directories currently installed.)
+Unpacking binutils (from .../binutils_2.16.1cvs20051109-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
-Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-2_amd64.deb) ...
+Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-3_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package perl-modules.
-Unpacking perl-modules (from .../perl-modules_5.8.7-7_all.deb) ...
+Unpacking perl-modules (from .../perl-modules_5.8.7-8_all.deb) ...
 Selecting previously deselected package perl.
-Unpacking perl (from .../perl_5.8.7-7_amd64.deb) ...
+Unpacking perl (from .../perl_5.8.7-8_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-2_amd64.deb) ...
 Selecting previously deselected package make.
@@ -611,13 +615,13 @@ Unpacking make (from .../make_3.80-11_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
 Unpacking dpkg-dev (from .../dpkg-dev_1.13.11_all.deb) ...
 Selecting previously deselected package gcc-4.0.
-Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-2_amd64.deb) ...
+Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-3_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package libstdc++6-4.0-dev.
-Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-2_amd64.deb) ...
+Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-3_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
-Unpacking g++-4.0 (from .../g++-4.0_4.0.2-2_amd64.deb) ...
+Unpacking g++-4.0 (from .../g++-4.0_4.0.2-3_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
@@ -626,30 +630,30 @@ Selecting previously deselected package libc6-dev.
 Unpacking libc6-dev (from .../libc6-dev_2.3.5-7_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.1_amd64.deb) ...
-Setting up binutils (2.16.1cvs20050902-1) ...
+Setting up binutils (2.16.1cvs20051109-1) ...
 
-Setting up cpp-4.0 (4.0.2-2) ...
+Setting up cpp-4.0 (4.0.2-3) ...
 Setting up cpp (4.0.2-1) ...
 Setting up patch (2.5.9-2) ...
 Setting up make (3.80-11) ...
 
-Setting up gcc-4.0 (4.0.2-2) ...
+Setting up gcc-4.0 (4.0.2-3) ...
 Setting up gcc (4.0.2-1) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
 Setting up libc6-dev (2.3.5-7) ...
-Setting up libstdc++6-4.0-dev (4.0.2-2) ...
-Setting up perl-modules (5.8.7-7) ...
-Setting up g++-4.0 (4.0.2-2) ...
+Setting up libstdc++6-4.0-dev (4.0.2-3) ...
+Setting up perl-modules (5.8.7-8) ...
+Setting up g++-4.0 (4.0.2-3) ...
 Setting up g++ (4.0.2-1) ...
 
-Setting up perl (5.8.7-7) ...
+Setting up perl (5.8.7-8) ...
 
 Setting up dpkg-dev (1.13.11) ...
 Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22353 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16046 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 6b75cda..f1399b4 100644
--- a/testsuite/normal/pbuilder-execute-etch.log
+++ b/testsuite/normal/pbuilder-execute-etch.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//29483/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//19304/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//29483 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19304 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sarge.log b/testsuite/normal/pbuilder-execute-sarge.log
index a56bc6d..9dc0711 100644
--- a/testsuite/normal/pbuilder-execute-sarge.log
+++ b/testsuite/normal/pbuilder-execute-sarge.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//20743/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//9714/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//20743 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//9714 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index 6bbde53..c2f9a11 100644
--- a/testsuite/normal/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//20598/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//31693/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//20598 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//31693 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index c941fd5..6b62595 100644
--- a/testsuite/normal/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//1197/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//23750/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -16,22 +16,36 @@ Get:2 http://ftp.jp.debian.org ../project/experimental Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [120kB]
-Fetched 125kB in 0s (295kB/s)
+Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [125kB]
+Fetched 130kB in 0s (303kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
+The following packages will be REMOVED:
+  aptitude tasksel
 The following packages will be upgraded:
-  diff
-1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/246kB of archives.
-After unpacking 303kB of additional disk space will be used.
-(Reading database ... 11842 files and directories currently installed.)
+  apt apt-utils diff
+3 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0B/1713kB of archives.
+After unpacking 8729kB disk space will be freed.
+(Reading database ... 11855 files and directories currently installed.)
+Removing tasksel ...
+Removing aptitude ...
+(Reading database ... 11665 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
+(Reading database ... 11673 files and directories currently installed.)
+Preparing to replace apt-utils 0.6.42.3 (using .../apt-utils_0.6.42.3exp1_amd64.deb) ...
+Unpacking replacement apt-utils ...
+Preparing to replace apt 0.6.42.3 (using .../apt_0.6.42.3exp1_amd64.deb) ...
+Unpacking replacement apt ...
+Setting up apt (0.6.42.3exp1) ...
+
+Setting up apt-utils (0.6.42.3exp1) ...
+
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -41,6 +55,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//1197 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23750 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 77c3a54..3af24a8 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,19 +1,19 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//30479/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//20348/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
-Get:2 http://ftp.jp.debian.org sid Release [4800B]
-Get:3 http://ftp.jp.debian.org sid/main Packages [3728kB]
-Fetched 3733kB in 2s (1605kB/s)
+Get:2 http://ftp.jp.debian.org sid Release [5336B]
+Get:3 http://ftp.jp.debian.org sid/main Packages [3738kB]
+Fetched 3744kB in 2s (1750kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -22,40 +22,41 @@ Building dependency tree...
 The following NEW packages will be installed:
   libsigc++-2.0-0c2
 The following packages will be upgraded:
-  apt apt-utils aptitude binutils console-data console-tools cron debconf
-  debconf-i18n debianutils gnupg grep libc6 libc6-dev libconsole libdb4.2
-  libdb4.3 libncurses5 libncursesw5 libslang2 libusb-0.1-4 login makedev
-  manpages module-init-tools nano ncurses-base ncurses-bin passwd procps sed
-  tasksel zlib1g
-33 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/22.4MB of archives.
-After unpacking 2789kB of additional disk space will be used.
-(Reading database ... 11821 files and directories currently installed.)
-Preparing to replace debianutils 2.15 (using .../debianutils_2.15.1_amd64.deb) ...
-Unpacking replacement debianutils ...
-Setting up debianutils (2.15.1) ...
-
-(Reading database ... 11821 files and directories currently installed.)
+  apt apt-utils aptitude binutils console-data console-tools coreutils cpp-4.0
+  cron debconf debconf-i18n g++-4.0 gcc-4.0 gcc-4.0-base grep initscripts
+  libc6 libc6-dev libconsole libdb4.2 libdb4.3 libgcc1 libncurses5
+  libncursesw5 libslang2 libssl0.9.8 libstdc++6 libstdc++6-4.0-dev libtasn1-2
+  login makedev manpages nano ncurses-base ncurses-bin passwd perl perl-base
+  perl-modules procps sed sysv-rc sysvinit tasksel zlib1g
+Preconfiguring packages ...
+45 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/39.2MB of archives.
+After unpacking 3551kB of additional disk space will be used.
+(Reading database ... 11815 files and directories currently installed.)
+Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-2_amd64.deb) ...
+Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
+No diversion `any diversion of /usr/bin/md5sum.textutils', none removed
+Unpacking replacement coreutils ...
+Setting up coreutils (5.93-2) ...
+
+(Reading database ... 11830 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds2-2 (using .../grep_2.5.1.ds2-4_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-4) ...
 
-(Reading database ... 11821 files and directories currently installed.)
+(Reading database ... 11830 files and directories currently installed.)
 Preparing to replace login 1:4.0.13-1 (using .../login_1%3a4.0.13-6_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-6) ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11821 files and directories currently installed.)
+(Reading database ... 11830 files and directories currently installed.)
 Preparing to replace ncurses-bin 5.4-9 (using .../ncurses-bin_5.5-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.5-1) ...
-(Reading database ... 11821 files and directories currently installed.)
-Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
-Unpacking replacement sed ...
-Setting up sed (4.1.4-4) ...
-
-(Reading database ... 11822 files and directories currently installed.)
+(Reading database ... 11830 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.7-7 (using .../perl-modules_5.8.7-8_all.deb) ...
+Unpacking replacement perl-modules ...
 Preparing to replace libc6-dev 2.3.5-6 (using .../libc6-dev_2.3.5-7_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.5-6 (using .../libc6_2.3.5-7_amd64.deb) ...
@@ -63,44 +64,114 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-7) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 Current default timezone: 'UTC'.
-Local time is now:      Tue Nov 15 03:21:03 UTC 2005.
-Universal Time is now:  Tue Nov 15 03:21:03 UTC 2005.
+Local time is now:      Wed Nov 16 04:42:51 UTC 2005.
+Universal Time is now:  Wed Nov 16 04:42:51 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11822 files and directories currently installed.)
+(Reading database ... 11830 files and directories currently installed.)
+Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
+Preparing to replace perl 5.8.7-7 (using .../perl_5.8.7-8_amd64.deb) ...
+Unpacking replacement perl ...
+Preparing to replace perl-base 5.8.7-7 (using .../perl-base_5.8.7-8_amd64.deb) ...
+Unpacking replacement perl-base ...
+Setting up perl-base (5.8.7-8) ...
+(Reading database ... 11828 files and directories currently installed.)
+Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.4-4) ...
+
+(Reading database ... 11829 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-5_amd64.deb) ...
+Unpacking replacement sysvinit ...
+Setting up sysvinit (2.86.ds1-5) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 11829 files and directories currently installed.)
 Preparing to replace libncurses5 5.4-9 (using .../libncurses5_5.5-1_amd64.deb) ...
 Unpacking replacement libncurses5 ...
 Setting up libncurses5 (5.5-1) ...
 
-(Reading database ... 11822 files and directories currently installed.)
+(Reading database ... 11829 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-9 (using .../ncurses-base_5.5-1_all.deb) ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.5-1) ...
-(Reading database ... 11822 files and directories currently installed.)
+(Reading database ... 11829 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.4.58 (using .../debconf-i18n_1.4.59_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.58 (using .../debconf_1.4.59_all.deb) ...
 Unpacking replacement debconf ...
+Preparing to replace libgcc1 1:4.0.2-2 (using .../libgcc1_1%3a4.0.2-3_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up libgcc1 (4.0.2-3) ...
+
+(Reading database ... 11832 files and directories currently installed.)
+Preparing to replace libstdc++6-4.0-dev 4.0.2-2 (using .../libstdc++6-4.0-dev_4.0.2-3_amd64.deb) ...
+Unpacking replacement libstdc++6-4.0-dev ...
+Preparing to replace g++-4.0 4.0.2-2 (using .../g++-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement g++-4.0 ...
+Preparing to replace gcc-4.0 4.0.2-2 (using .../gcc-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement gcc-4.0 ...
+Preparing to replace cpp-4.0 4.0.2-2 (using .../cpp-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement cpp-4.0 ...
+Preparing to replace binutils 2.16.1-2 (using .../binutils_2.16.1cvs20051109-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace gcc-4.0-base 4.0.2-2 (using .../gcc-4.0-base_4.0.2-3_amd64.deb) ...
+Unpacking replacement gcc-4.0-base ...
+Preparing to replace libstdc++6 4.0.2-2 (using .../libstdc++6_4.0.2-3_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up gcc-4.0-base (4.0.2-3) ...
+Setting up libstdc++6 (4.0.2-3) ...
+
+(Reading database ... 11842 files and directories currently installed.)
 Preparing to replace apt 0.6.42.2 (using .../apt_0.6.42.3_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.42.3) ...
 
-(Reading database ... 11825 files and directories currently installed.)
+(Reading database ... 11842 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-5_amd64.deb) ...
+Unpacking replacement initscripts ...
+Setting up initscripts (2.86.ds1-5) ...
+Installing new version of config file /etc/init.d/bootclean.sh ...
+Installing new version of config file /etc/init.d/bootlogd ...
+Installing new version of config file /etc/init.d/bootmisc.sh ...
+Installing new version of config file /etc/init.d/checkfs.sh ...
+Installing new version of config file /etc/init.d/checkroot.sh ...
+Installing new version of config file /etc/init.d/halt ...
+Installing new version of config file /etc/init.d/hostname.sh ...
+Installing new version of config file /etc/init.d/mountall.sh ...
+Installing new version of config file /etc/init.d/mountnfs.sh ...
+Installing new version of config file /etc/init.d/mountvirtfs ...
+Installing new version of config file /etc/init.d/reboot ...
+Installing new version of config file /etc/init.d/rmnologin ...
+Installing new version of config file /etc/init.d/sendsigs ...
+Installing new version of config file /etc/init.d/single ...
+Installing new version of config file /etc/init.d/umountfs ...
+Installing new version of config file /etc/init.d/umountnfs.sh ...
+Installing new version of config file /etc/init.d/umountroot ...
+Installing new version of config file /etc/init.d/urandom ...
+
+(Reading database ... 11842 files and directories currently installed.)
 Preparing to replace libslang2 2.0.4-7 (using .../libslang2_2.0.5-1_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.5-1) ...
 
-(Reading database ... 11825 files and directories currently installed.)
+(Reading database ... 11842 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.13-1 (using .../passwd_1%3a4.0.13-6_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-6) ...
 
-(Reading database ... 11825 files and directories currently installed.)
+(Reading database ... 11842 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-5_all.deb) ...
+Unpacking replacement sysv-rc ...
+Setting up sysv-rc (2.86.ds1-5) ...
+
+(Reading database ... 11842 files and directories currently installed.)
 Preparing to replace zlib1g 1:1.2.3-4 (using .../zlib1g_1%3a1.2.3-6_amd64.deb) ...
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-6) ...
 
-(Reading database ... 11825 files and directories currently installed.)
+(Reading database ... 11842 files and directories currently installed.)
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Preparing to replace apt-utils 0.6.42.2 (using .../apt-utils_0.6.42.3_amd64.deb) ...
@@ -119,27 +190,26 @@ Preparing to replace libconsole 1:0.2.3dbs-57 (using .../libconsole_1%3a0.2.3dbs
 Unpacking replacement libconsole ...
 Preparing to replace cron 3.0pl1-91 (using .../cron_3.0pl1-92_amd64.deb) ...
 Unpacking replacement cron ...
-Preparing to replace libusb-0.1-4 2:0.1.10a-21 (using .../libusb-0.1-4_2%3a0.1.10a-22_amd64.deb) ...
-Unpacking replacement libusb-0.1-4 ...
-Preparing to replace makedev 2.3.1-78 (using .../makedev_2.3.1-79_all.deb) ...
-Unpacking replacement makedev ...
-Preparing to replace gnupg 1.4.1-1.0.1 (using .../gnupg_1.4.2-2_amd64.deb) ...
-Unpacking replacement gnupg ...
-Preparing to replace manpages 2.02-2 (using .../manpages_2.03-1_all.deb) ...
+Preparing to replace libssl0.9.8 0.9.8a-3 (using .../libssl0.9.8_0.9.8a-4_amd64.deb) ...
+Unpacking replacement libssl0.9.8 ...
+Preparing to replace libtasn1-2 0.2.13-1 (using .../libtasn1-2_0.2.17-1_amd64.deb) ...
+Unpacking replacement libtasn1-2 ...
+Preparing to replace manpages 2.02-2 (using .../manpages_2.05-1_all.deb) ...
 Unpacking replacement manpages ...
-Preparing to replace module-init-tools 3.2-pre9-2 (using .../module-init-tools_3.2-pre9-4_amd64.deb) ...
-Unpacking replacement module-init-tools ...
 Preparing to replace nano 1.3.8-2 (using .../nano_1.3.9-1_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace tasksel 2.32 (using .../archives/tasksel_2.33_all.deb) ...
 Unpacking replacement tasksel ...
-Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
-Unpacking replacement libdb4.3 ...
+Preparing to replace makedev 2.3.1-78 (using .../makedev_2.3.1-79_all.deb) ...
+Unpacking replacement makedev ...
 Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace binutils 2.16.1-2 (using .../binutils_2.16.1cvs20050902-1_amd64.deb) ...
-Unpacking replacement binutils ...
+Setting up libdb4.3 (4.3.29-1) ...
 Setting up libc6-dev (2.3.5-7) ...
+Setting up cpp-4.0 (4.0.2-3) ...
+Setting up binutils (2.16.1cvs20051109-1) ...
+
+Setting up gcc-4.0 (4.0.2-3) ...
 Setting up libdb4.2 (4.2.52-20) ...
 Setting up apt-utils (0.6.42.3) ...
 
@@ -154,36 +224,36 @@ Setting up libconsole (0.2.3dbs-58) ...
 Setting up cron (3.0pl1-92) ...
 Installing new version of config file /etc/init.d/cron ...
 
-Setting up libusb-0.1-4 (0.1.10a-22) ...
+Setting up libtasn1-2 (0.2.17-1) ...
+
+Setting up manpages (2.05-1) ...
+Setting up nano (1.3.9-1) ...
 
 Setting up makedev (2.3.1-79) ...
 Installing new version of config file /etc/init.d/makedev ...
 
-Setting up gnupg (1.4.2-2) ...
-Setting up manpages (2.03-1) ...
-Setting up module-init-tools (3.2-pre9-4) ...
-Installing new version of config file /etc/init.d/module-init-tools ...
-
-Setting up nano (1.3.9-1) ...
-
-Setting up libdb4.3 (4.3.29-1) ...
 Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
 
-Setting up binutils (2.16.1cvs20050902-1) ...
-
 Setting up debconf-i18n (1.4.59) ...
+Setting up libstdc++6-4.0-dev (4.0.2-3) ...
+Setting up perl-modules (5.8.7-8) ...
 Setting up debconf (1.4.59) ...
 
+Setting up g++-4.0 (4.0.2-3) ...
 Setting up console-data (2002.12.04dbs-50) ...
 Looking for keymap to install:
 NONE
 
 Setting up console-tools (0.2.3dbs-58) ...
 
+Setting up libssl0.9.8 (0.9.8a-4) ...
+
 Setting up tasksel (2.33) ...
 
+Setting up perl (5.8.7-8) ...
+
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -193,6 +263,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//30479 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//20348 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
index d595d1c..e418e1b 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//30202/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//19634/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,8 +18,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [120kB]
-Fetched 125kB in 0s (272kB/s)
+Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [125kB]
+Fetched 130kB in 0s (310kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -28,17 +28,31 @@ dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
+The following packages will be REMOVED:
+  aptitude tasksel
 The following packages will be upgraded:
-  diff
-1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/246kB of archives.
-After unpacking 303kB of additional disk space will be used.
+  apt apt-utils diff
+3 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0B/1713kB of archives.
+After unpacking 8729kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
-  diff
-(Reading database ... 12458 files and directories currently installed.)
+  diff apt-utils apt
+(Reading database ... 12470 files and directories currently installed.)
+Removing tasksel ...
+Removing aptitude ...
+(Reading database ... 12280 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
+(Reading database ... 12288 files and directories currently installed.)
+Preparing to replace apt-utils 0.6.42.3 (using .../apt-utils_0.6.42.3exp1_amd64.deb) ...
+Unpacking replacement apt-utils ...
+Preparing to replace apt 0.6.42.3 (using .../apt_0.6.42.3exp1_amd64.deb) ...
+Unpacking replacement apt ...
+Setting up apt (0.6.42.3exp1) ...
+
+Setting up apt-utils (0.6.42.3exp1) ...
+
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -48,6 +62,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//30202 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19634 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid.log b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
index 76a5cb1..f1ed169 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
@@ -1,20 +1,20 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//26808/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//16125/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
-Get:2 http://ftp.jp.debian.org sid Release [4800B]
+Get:2 http://ftp.jp.debian.org sid Release [5336B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3728kB]
-Fetched 3733kB in 2s (1727kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3738kB]
+Fetched 3744kB in 2s (1621kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -25,48 +25,51 @@ Building dependency tree...
 The following NEW packages will be installed:
   libsigc++-2.0-0c2
 The following packages will be upgraded:
-  apt apt-utils aptitude binutils console-data console-tools cpp-3.3 cron
-  debconf debconf-i18n debianutils exim4 exim4-base exim4-config
-  exim4-daemon-light g++-3.3 gcc-3.3 gcc-3.3-base grep libc6 libc6-dev
-  libconsole libdb4.2 libdb4.3 libncurses5 libncursesw5 libslang2 libstdc++5
-  libstdc++5-3.3-dev login makedev manpages nano ncurses-base ncurses-bin
-  passwd procps psmisc sed tasksel zlib1g
-41 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/28.2MB of archives.
-After unpacking 2556kB of additional disk space will be used.
+  apt apt-utils aptitude binutils console-data console-tools coreutils cpp-3.3
+  cpp-4.0 cron debconf debconf-i18n g++-3.3 g++-4.0 gcc-3.3 gcc-3.3-base
+  gcc-4.0 gcc-4.0-base grep initscripts libc6 libc6-dev libconsole libdb4.2
+  libdb4.3 libgcc1 libgnutls12 libncurses5 libncursesw5 libperl5.8 libslang2
+  libssl0.9.8 libstdc++5 libstdc++5-3.3-dev libstdc++6 libstdc++6-4.0-dev
+  libtasn1-2 login makedev manpages nano ncurses-base ncurses-bin passwd perl
+  perl-base perl-modules procps psmisc sed sysv-rc sysvinit tasksel zlib1g
+54 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/46.0MB of archives.
+After unpacking 3478kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  debianutils grep login ncurses-bin sed libc6-dev libc6 libncurses5
-  ncurses-base debconf-i18n debconf apt libslang2 passwd zlib1g libdb4.2
-  apt-utils libncursesw5 libsigc++-2.0-0c2 aptitude console-data console-tools
-  libconsole cron manpages nano tasksel libdb4.3 makedev procps binutils
-  exim4-config exim4-base exim4-daemon-light exim4 gcc-3.3-base cpp-3.3
-  gcc-3.3 libstdc++5 libstdc++5-3.3-dev g++-3.3 psmisc
-(Reading database ... 12432 files and directories currently installed.)
-Preparing to replace debianutils 2.15 (using .../debianutils_2.15.1_amd64.deb) ...
-Unpacking replacement debianutils ...
-Setting up debianutils (2.15.1) ...
-
-(Reading database ... 12432 files and directories currently installed.)
+  coreutils grep login ncurses-bin perl-modules libc6-dev libc6 libdb4.3 perl
+  libperl5.8 perl-base sed sysvinit libncurses5 ncurses-base debconf-i18n
+  debconf libgcc1 libstdc++6-4.0-dev g++-4.0 gcc-4.0 cpp-4.0 binutils
+  gcc-4.0-base libstdc++6 apt initscripts libslang2 passwd sysv-rc zlib1g
+  libdb4.2 apt-utils libncursesw5 libsigc++-2.0-0c2 aptitude console-data
+  console-tools libconsole cron libssl0.9.8 libtasn1-2 manpages nano tasksel
+  makedev procps libgnutls12 gcc-3.3-base cpp-3.3 gcc-3.3 libstdc++5
+  libstdc++5-3.3-dev g++-3.3 psmisc
+Preconfiguring packages ...
+(Reading database ... 12429 files and directories currently installed.)
+Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-2_amd64.deb) ...
+Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
+Removing `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
+Unpacking replacement coreutils ...
+Setting up coreutils (5.93-2) ...
+
+(Reading database ... 12443 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds2-2 (using .../grep_2.5.1.ds2-4_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-4) ...
 
-(Reading database ... 12432 files and directories currently installed.)
+(Reading database ... 12443 files and directories currently installed.)
 Preparing to replace login 1:4.0.13-1 (using .../login_1%3a4.0.13-6_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-6) ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 12432 files and directories currently installed.)
+(Reading database ... 12443 files and directories currently installed.)
 Preparing to replace ncurses-bin 5.4-9 (using .../ncurses-bin_5.5-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.5-1) ...
-(Reading database ... 12432 files and directories currently installed.)
-Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
-Unpacking replacement sed ...
-Setting up sed (4.1.4-4) ...
-
-(Reading database ... 12433 files and directories currently installed.)
+(Reading database ... 12443 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.7-7 (using .../perl-modules_5.8.7-8_all.deb) ...
+Unpacking replacement perl-modules ...
 Preparing to replace libc6-dev 2.3.5-6 (using .../libc6-dev_2.3.5-7_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.5-6 (using .../libc6_2.3.5-7_amd64.deb) ...
@@ -74,44 +77,116 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-7) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 Current default timezone: 'UTC'.
-Local time is now:      Tue Nov 15 03:13:11 UTC 2005.
-Universal Time is now:  Tue Nov 15 03:13:11 UTC 2005.
+Local time is now:      Wed Nov 16 04:34:49 UTC 2005.
+Universal Time is now:  Wed Nov 16 04:34:49 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 12433 files and directories currently installed.)
+(Reading database ... 12443 files and directories currently installed.)
+Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
+Preparing to replace perl 5.8.7-7 (using .../perl_5.8.7-8_amd64.deb) ...
+Unpacking replacement perl ...
+Preparing to replace libperl5.8 5.8.7-7 (using .../libperl5.8_5.8.7-8_amd64.deb) ...
+Unpacking replacement libperl5.8 ...
+Preparing to replace perl-base 5.8.7-7 (using .../perl-base_5.8.7-8_amd64.deb) ...
+Unpacking replacement perl-base ...
+Setting up perl-base (5.8.7-8) ...
+(Reading database ... 12441 files and directories currently installed.)
+Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.4-4) ...
+
+(Reading database ... 12442 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-5_amd64.deb) ...
+Unpacking replacement sysvinit ...
+Setting up sysvinit (2.86.ds1-5) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 12442 files and directories currently installed.)
 Preparing to replace libncurses5 5.4-9 (using .../libncurses5_5.5-1_amd64.deb) ...
 Unpacking replacement libncurses5 ...
 Setting up libncurses5 (5.5-1) ...
 
-(Reading database ... 12433 files and directories currently installed.)
+(Reading database ... 12442 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-9 (using .../ncurses-base_5.5-1_all.deb) ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.5-1) ...
-(Reading database ... 12433 files and directories currently installed.)
+(Reading database ... 12442 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.4.58 (using .../debconf-i18n_1.4.59_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.58 (using .../debconf_1.4.59_all.deb) ...
 Unpacking replacement debconf ...
+Preparing to replace libgcc1 1:4.0.2-2 (using .../libgcc1_1%3a4.0.2-3_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up libgcc1 (4.0.2-3) ...
+
+(Reading database ... 12445 files and directories currently installed.)
+Preparing to replace libstdc++6-4.0-dev 4.0.2-2 (using .../libstdc++6-4.0-dev_4.0.2-3_amd64.deb) ...
+Unpacking replacement libstdc++6-4.0-dev ...
+Preparing to replace g++-4.0 4.0.2-2 (using .../g++-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement g++-4.0 ...
+Preparing to replace gcc-4.0 4.0.2-2 (using .../gcc-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement gcc-4.0 ...
+Preparing to replace cpp-4.0 4.0.2-2 (using .../cpp-4.0_4.0.2-3_amd64.deb) ...
+Unpacking replacement cpp-4.0 ...
+Preparing to replace binutils 2.16.1-2 (using .../binutils_2.16.1cvs20051109-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace gcc-4.0-base 4.0.2-2 (using .../gcc-4.0-base_4.0.2-3_amd64.deb) ...
+Unpacking replacement gcc-4.0-base ...
+Preparing to replace libstdc++6 4.0.2-2 (using .../libstdc++6_4.0.2-3_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up gcc-4.0-base (4.0.2-3) ...
+Setting up libstdc++6 (4.0.2-3) ...
+
+(Reading database ... 12455 files and directories currently installed.)
 Preparing to replace apt 0.6.42.2 (using .../apt_0.6.42.3_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.42.3) ...
 
-(Reading database ... 12436 files and directories currently installed.)
+(Reading database ... 12455 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-5_amd64.deb) ...
+Unpacking replacement initscripts ...
+Setting up initscripts (2.86.ds1-5) ...
+Installing new version of config file /etc/init.d/bootclean.sh ...
+Installing new version of config file /etc/init.d/bootlogd ...
+Installing new version of config file /etc/init.d/bootmisc.sh ...
+Installing new version of config file /etc/init.d/checkfs.sh ...
+Installing new version of config file /etc/init.d/checkroot.sh ...
+Installing new version of config file /etc/init.d/halt ...
+Installing new version of config file /etc/init.d/hostname.sh ...
+Installing new version of config file /etc/init.d/mountall.sh ...
+Installing new version of config file /etc/init.d/mountnfs.sh ...
+Installing new version of config file /etc/init.d/mountvirtfs ...
+Installing new version of config file /etc/init.d/reboot ...
+Installing new version of config file /etc/init.d/rmnologin ...
+Installing new version of config file /etc/init.d/sendsigs ...
+Installing new version of config file /etc/init.d/single ...
+Installing new version of config file /etc/init.d/umountfs ...
+Installing new version of config file /etc/init.d/umountnfs.sh ...
+Installing new version of config file /etc/init.d/umountroot ...
+Installing new version of config file /etc/init.d/urandom ...
+
+(Reading database ... 12455 files and directories currently installed.)
 Preparing to replace libslang2 2.0.4-7 (using .../libslang2_2.0.5-1_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.5-1) ...
 
-(Reading database ... 12436 files and directories currently installed.)
+(Reading database ... 12455 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.13-1 (using .../passwd_1%3a4.0.13-6_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-6) ...
 
-(Reading database ... 12436 files and directories currently installed.)
+(Reading database ... 12455 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-5_all.deb) ...
+Unpacking replacement sysv-rc ...
+Setting up sysv-rc (2.86.ds1-5) ...
+
+(Reading database ... 12455 files and directories currently installed.)
 Preparing to replace zlib1g 1:1.2.3-4 (using .../zlib1g_1%3a1.2.3-6_amd64.deb) ...
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-6) ...
 
-(Reading database ... 12436 files and directories currently installed.)
+(Reading database ... 12455 files and directories currently installed.)
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Preparing to replace apt-utils 0.6.42.2 (using .../apt-utils_0.6.42.3_amd64.deb) ...
@@ -130,28 +205,22 @@ Preparing to replace libconsole 1:0.2.3dbs-57 (using .../libconsole_1%3a0.2.3dbs
 Unpacking replacement libconsole ...
 Preparing to replace cron 3.0pl1-91 (using .../cron_3.0pl1-92_amd64.deb) ...
 Unpacking replacement cron ...
-Preparing to replace manpages 2.02-2 (using .../manpages_2.03-1_all.deb) ...
+Preparing to replace libssl0.9.8 0.9.8a-3 (using .../libssl0.9.8_0.9.8a-4_amd64.deb) ...
+Unpacking replacement libssl0.9.8 ...
+Preparing to replace libtasn1-2 0.2.13-1 (using .../libtasn1-2_0.2.17-1_amd64.deb) ...
+Unpacking replacement libtasn1-2 ...
+Preparing to replace manpages 2.02-2 (using .../manpages_2.05-1_all.deb) ...
 Unpacking replacement manpages ...
 Preparing to replace nano 1.3.8-2 (using .../nano_1.3.9-1_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace tasksel 2.32 (using .../archives/tasksel_2.33_all.deb) ...
 Unpacking replacement tasksel ...
-Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
-Unpacking replacement libdb4.3 ...
 Preparing to replace makedev 2.3.1-78 (using .../makedev_2.3.1-79_all.deb) ...
 Unpacking replacement makedev ...
 Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace binutils 2.16.1-2 (using .../binutils_2.16.1cvs20050902-1_amd64.deb) ...
-Unpacking replacement binutils ...
-Preparing to replace exim4-config 4.54-1 (using .../exim4-config_4.54-2_all.deb) ...
-Unpacking replacement exim4-config ...
-Preparing to replace exim4-base 4.54-1 (using .../exim4-base_4.54-2_amd64.deb) ...
-Unpacking replacement exim4-base ...
-Preparing to replace exim4-daemon-light 4.54-1 (using .../exim4-daemon-light_4.54-2_amd64.deb) ...
-Unpacking replacement exim4-daemon-light ...
-Preparing to replace exim4 4.54-1 (using .../archives/exim4_4.54-2_all.deb) ...
-Unpacking replacement exim4 ...
+Preparing to replace libgnutls12 1.2.8-1 (using .../libgnutls12_1.2.9-1_amd64.deb) ...
+Unpacking replacement libgnutls12 ...
 Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3-base ...
 Preparing to replace cpp-3.3 1:3.3.6-7 (using .../cpp-3.3_1%3a3.3.6-10_amd64.deb) ...
@@ -166,7 +235,14 @@ Preparing to replace g++-3.3 1:3.3.6-7 (using .../g++-3.3_1%3a3.3.6-10_amd64.deb
 Unpacking replacement g++-3.3 ...
 Preparing to replace psmisc 21.6-1 (using .../psmisc_21.8-1_amd64.deb) ...
 Unpacking replacement psmisc ...
+Setting up libdb4.3 (4.3.29-1) ...
 Setting up libc6-dev (2.3.5-7) ...
+Setting up libperl5.8 (5.8.7-8) ...
+
+Setting up cpp-4.0 (4.0.2-3) ...
+Setting up binutils (2.16.1cvs20051109-1) ...
+
+Setting up gcc-4.0 (4.0.2-3) ...
 Setting up libdb4.2 (4.2.52-20) ...
 Setting up apt-utils (0.6.42.3) ...
 
@@ -181,10 +257,11 @@ Setting up libconsole (0.2.3dbs-58) ...
 Setting up cron (3.0pl1-92) ...
 Installing new version of config file /etc/init.d/cron ...
 
-Setting up manpages (2.03-1) ...
+Setting up libtasn1-2 (0.2.17-1) ...
+
+Setting up manpages (2.05-1) ...
 Setting up nano (1.3.9-1) ...
 
-Setting up libdb4.3 (4.3.29-1) ...
 Setting up makedev (2.3.1-79) ...
 Installing new version of config file /etc/init.d/makedev ...
 
@@ -192,7 +269,7 @@ Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
 
-Setting up binutils (2.16.1cvs20050902-1) ...
+Setting up libgnutls12 (1.2.9-1) ...
 
 Setting up gcc-3.3-base (3.3.6-10) ...
 Setting up cpp-3.3 (3.3.6-10) ...
@@ -201,29 +278,26 @@ Setting up libstdc++5 (3.3.6-10) ...
 
 Setting up psmisc (21.8-1) ...
 
-Setting up libstdc++5-3.3-dev (3.3.6-10) ...
 Setting up debconf-i18n (1.4.59) ...
-Setting up g++-3.3 (3.3.6-10) ...
+Setting up libstdc++6-4.0-dev (4.0.2-3) ...
+Setting up libstdc++5-3.3-dev (3.3.6-10) ...
+Setting up perl-modules (5.8.7-8) ...
 Setting up debconf (1.4.59) ...
 
+Setting up g++-4.0 (4.0.2-3) ...
 Setting up console-data (2002.12.04dbs-50) ...
 Looking for keymap to install:
 NONE
 
 Setting up console-tools (0.2.3dbs-58) ...
 
-Setting up tasksel (2.33) ...
-
-Setting up exim4-config (4.54-2) ...
-Installing new version of config file /etc/exim4/conf.d/router/200_exim4-config_primary ...
-Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
-Installing new version of config file /etc/exim4/exim4.conf.template ...
+Setting up libssl0.9.8 (0.9.8a-4) ...
 
-Setting up exim4-base (4.54-2) ...
+Setting up tasksel (2.33) ...
 
-Setting up exim4-daemon-light (4.54-2) ...
+Setting up g++-3.3 (3.3.6-10) ...
+Setting up perl (5.8.7-8) ...
 
-Setting up exim4 (4.54-2) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -233,6 +307,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//26808 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16125 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch.log b/testsuite/normal/pbuilder-update-sarge-etch.log
index 95a2969..a07d65f 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch.log
@@ -1,18 +1,18 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/var/cache/pbuilder/build//21738/etc/mtab': File exists
+ln: `/var/cache/pbuilder/build//10761/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3441kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3448kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3441kB in 1s (1883kB/s)
+Fetched 3449kB in 1s (1766kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -41,6 +41,7 @@ The following packages will be upgraded:
   modutils mount nano ncurses-base ncurses-bin net-tools netbase netkit-inetd
   passwd pciutils perl perl-base perl-modules pppoeconf procps psmisc sysv-rc
   sysvinit tar tasksel telnet util-linux wget whiptail zlib1g
+Preconfiguring packages ...
 114 upgraded, 17 newly installed, 1 to remove and 0 not upgraded.
 Need to get 0B/60.2MB of archives.
 After unpacking 33.7MB of additional disk space will be used.
@@ -74,8 +75,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-6) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Tue Nov 15 03:11:29 UTC 2005.
-Universal Time is now:  Tue Nov 15 03:11:29 UTC 2005.
+Local time is now:      Wed Nov 16 04:33:02 UTC 2005.
+Universal Time is now:  Wed Nov 16 04:33:02 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11281 files and directories currently installed.)
@@ -128,10 +129,10 @@ Installing new version of config file /etc/issue.net ...
 Installing new version of config file /etc/nsswitch.conf ...
 
 (Reading database ... 11291 files and directories currently installed.)
-Preparing to replace debianutils 2.8.4 (using .../debianutils_2.15_amd64.deb) ...
+Preparing to replace debianutils 2.8.4 (using .../debianutils_2.15.1_amd64.deb) ...
 Unpacking replacement debianutils ...
 Replacing files in old package passwd ...
-Setting up debianutils (2.15) ...
+Setting up debianutils (2.15.1) ...
 
 (Reading database ... 11302 files and directories currently installed.)
 Preparing to replace libgpg-error0 1.0-1 (using .../libgpg-error0_1.1-4_amd64.deb) ...
@@ -153,7 +154,7 @@ Selecting previously deselected package libgnutls12.
 Unpacking libgnutls12 (from .../libgnutls12_1.2.8-1_amd64.deb) ...
 Preparing to replace libpcre3 4.5-1.2 (using .../libpcre3_6.4-1_amd64.deb) ...
 Unpacking replacement libpcre3 ...
-Preparing to replace exim4-daemon-light 4.50-8 (using .../exim4-daemon-light_4.54-1_amd64.deb) ...
+Preparing to replace exim4-daemon-light 4.50-8 (using .../exim4-daemon-light_4.54-2_amd64.deb) ...
 Unpacking replacement exim4-daemon-light ...
 Selecting previously deselected package libselinux1.
 Unpacking libselinux1 (from .../libselinux1_1.26-1_amd64.deb) ...
@@ -197,13 +198,13 @@ Preparing to replace adduser 3.63 (using .../archives/adduser_3.77_all.deb) ...
 Unpacking replacement adduser ...
 Preparing to replace cron 3.0pl1-86 (using .../cron_3.0pl1-91_amd64.deb) ...
 Unpacking replacement cron ...
-Preparing to replace exim4-config 4.50-8 (using .../exim4-config_4.54-1_all.deb) ...
+Preparing to replace exim4-config 4.50-8 (using .../exim4-config_4.54-2_all.deb) ...
 Unpacking replacement exim4-config ...
 Preparing to replace ncurses-bin 5.4-4 (using .../ncurses-bin_5.4-9_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.4-9) ...
 Selecting previously deselected package lsb-base.
-(Reading database ... 11853 files and directories currently installed.)
+(Reading database ... 11852 files and directories currently installed.)
 Unpacking lsb-base (from .../lsb-base_3.0-11_all.deb) ...
 Preparing to replace netkit-inetd 0.10-10 (using .../netkit-inetd_0.10-10.2_amd64.deb) ...
 Unpacking replacement netkit-inetd ...
@@ -211,7 +212,7 @@ Preparing to replace iputils-ping 3:20020927-2 (using .../iputils-ping_3%3a20020
 Unpacking replacement iputils-ping ...
 Preparing to replace netbase 4.21 (using .../archives/netbase_4.23_all.deb) ...
 Unpacking replacement netbase ...
-Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.54-1_amd64.deb) ...
+Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.54-2_amd64.deb) ...
 Unpacking replacement exim4-base ...
 Selecting previously deselected package libdb4.3.
 Unpacking libdb4.3 (from .../libdb4.3_4.3.28-2_amd64.deb) ...
@@ -223,7 +224,7 @@ Installing new version of config file /etc/security/access.conf ...
 Installing new version of config file /etc/security/pam_env.conf ...
 Installing new version of config file /etc/security/limits.conf ...
 
-(Reading database ... 11871 files and directories currently installed.)
+(Reading database ... 11868 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.13-1_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-1) ...
@@ -231,14 +232,14 @@ Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11880 files and directories currently installed.)
+(Reading database ... 11877 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.3-31sarge5 (using .../passwd_1%3a4.0.13-1_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-1) ...
 Installing new version of config file /etc/pam.d/chfn ...
 Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 11906 files and directories currently installed.)
+(Reading database ... 11903 files and directories currently installed.)
 Preparing to replace bash 2.05b-26 (using .../archives/bash_3.0-17_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.0-17) ...
@@ -247,17 +248,17 @@ Installing new version of config file /etc/skel/.bash_profile ...
 Installing new version of config file /etc/bash.bashrc ...
 Installing new version of config file /etc/bash_completion ...
 
-(Reading database ... 11910 files and directories currently installed.)
+(Reading database ... 11907 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12p-8) ...
 
-(Reading database ... 11910 files and directories currently installed.)
+(Reading database ... 11907 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2 (using .../coreutils_5.2.1-2.1_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (5.2.1-2.1) ...
 
-(Reading database ... 11909 files and directories currently installed.)
+(Reading database ... 11906 files and directories currently installed.)
 Preparing to replace dpkg 1.10.28 (using .../dpkg_1.13.11_amd64.deb) ...
 Unpacking replacement dpkg ...
 Setting up dpkg (1.13.11) ...
@@ -265,69 +266,69 @@ Installing new version of config file /etc/dpkg/origins/debian ...
 Adding `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Adding `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 
-(Reading database ... 11908 files and directories currently installed.)
+(Reading database ... 11905 files and directories currently installed.)
 Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38-2_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.38-2) ...
 
-(Reading database ... 11908 files and directories currently installed.)
+(Reading database ... 11905 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38-2_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.38-2) ...
-(Reading database ... 11912 files and directories currently installed.)
+(Reading database ... 11909 files and directories currently installed.)
 Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.25-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.25-1) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11932 files and directories currently installed.)
+(Reading database ... 11929 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds1-4 (using .../grep_2.5.1.ds2-2_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-2) ...
 
-(Reading database ... 11931 files and directories currently installed.)
+(Reading database ... 11928 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-10 (using .../gzip_1.3.5-12_amd64.deb) ...
 Unpacking replacement gzip ...
 Setting up gzip (1.3.5-12) ...
 
-(Reading database ... 11931 files and directories currently installed.)
+(Reading database ... 11928 files and directories currently installed.)
 Preparing to replace hostname 2.13 (using .../hostname_2.91_amd64.deb) ...
 Unpacking replacement hostname ...
 Setting up hostname (2.91) ...
-(Reading database ... 11931 files and directories currently installed.)
+(Reading database ... 11928 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12p-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12p-8) ...
 
 Selecting previously deselected package libsepol1.
-(Reading database ... 11931 files and directories currently installed.)
+(Reading database ... 11928 files and directories currently installed.)
 Unpacking libsepol1 (from .../libsepol1_1.8-1_amd64.deb) ...
 Setting up libsepol1 (1.8-1) ...
 
-(Reading database ... 11936 files and directories currently installed.)
+(Reading database ... 11933 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-4) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11936 files and directories currently installed.)
+(Reading database ... 11933 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-2_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
 Selecting previously deselected package libslang2.
-(Reading database ... 11940 files and directories currently installed.)
+(Reading database ... 11937 files and directories currently installed.)
 Unpacking libslang2 (from .../libslang2_2.0.4-7_amd64.deb) ...
 Setting up libslang2 (2.0.4-7) ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11949 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12p-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11949 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-4 (using .../ncurses-base_5.4-9_all.deb) ...
 Removing obsolete conffile /etc/terminfo/E/Eterm ...
 Removing obsolete conffile /etc/terminfo/E/Eterm-color ...
@@ -365,7 +366,7 @@ Removing obsolete conffile /etc/terminfo/x/xterm-vt220 ...
 Removing obsolete conffile /etc/terminfo/x/xterm-color ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.4-9) ...
-(Reading database ... 11956 files and directories currently installed.)
+(Reading database ... 11953 files and directories currently installed.)
 Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-57_amd64.deb) ...
 Unpacking replacement console-tools ...
 Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-57_amd64.deb) ...
@@ -377,14 +378,14 @@ Setting up libtext-wrapi18n-perl (0.06-4) ...
 Setting up debconf-i18n (1.4.58) ...
 Setting up debconf (1.4.58) ...
 
-(Reading database ... 11956 files and directories currently installed.)
+(Reading database ... 11953 files and directories currently installed.)
 Preparing to replace console-common 0.7.49 (using .../console-common_0.7.54_all.deb) ...
 Unpacking replacement console-common ...
 Preparing to replace dselect 1.10.28 (using .../dselect_1.13.11_amd64.deb) ...
 Unpacking replacement dselect ...
 Setting up dselect (1.13.11) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 11961 files and directories currently installed.)
+(Reading database ... 11958 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement initscripts ...
 Setting up lsb-base (3.0-11) ...
@@ -408,7 +409,7 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/urandom ...
 Installing new version of config file /etc/default/tmpfs ...
 
-(Reading database ... 11962 files and directories currently installed.)
+(Reading database ... 11959 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.25-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.32-1_amd64.deb) ...
@@ -417,32 +418,32 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.32-1) ...
 
-(Reading database ... 11962 files and directories currently installed.)
+(Reading database ... 11959 files and directories currently installed.)
 Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38-2_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38-2) ...
 
-(Reading database ... 11962 files and directories currently installed.)
+(Reading database ... 11959 files and directories currently installed.)
 Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38-2_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38-2) ...
 
-(Reading database ... 11962 files and directories currently installed.)
+(Reading database ... 11959 files and directories currently installed.)
 Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38-2_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38-2) ...
 
-(Reading database ... 11962 files and directories currently installed.)
+(Reading database ... 11959 files and directories currently installed.)
 Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38-2_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38-2) ...
 
-(Reading database ... 11962 files and directories currently installed.)
+(Reading database ... 11959 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-4_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-4) ...
 
-(Reading database ... 11962 files and directories currently installed.)
+(Reading database ... 11959 files and directories currently installed.)
 Preparing to replace binutils 2.15-6 (using .../binutils_2.16.1-2_amd64.deb) ...
 Unpacking replacement binutils ...
 Preparing to replace libstdc++5-3.3-dev 1:3.3.5-13 (using .../libstdc++5-3.3-dev_1%3a3.3.6-7_amd64.deb) ...
@@ -461,7 +462,7 @@ Setting up gcc-3.3-base (3.3.6-7) ...
 Setting up libstdc++5 (3.3.6-7) ...
 
 Selecting previously deselected package dmidecode.
-(Reading database ... 11970 files and directories currently installed.)
+(Reading database ... 11967 files and directories currently installed.)
 Unpacking dmidecode (from .../dmidecode_2.7-2_amd64.deb) ...
 Selecting previously deselected package laptop-detect.
 Unpacking laptop-detect (from .../laptop-detect_0.12.1_amd64.deb) ...
@@ -522,7 +523,7 @@ Preparing to replace make 3.80-9 (using .../make_3.80-11_amd64.deb) ...
 Unpacking replacement make ...
 Preparing to replace dpkg-dev 1.10.28 (using .../dpkg-dev_1.13.11_all.deb) ...
 Unpacking replacement dpkg-dev ...
-Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.54-1_all.deb) ...
+Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.54-2_all.deb) ...
 Unpacking replacement exim4 ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-2_amd64.deb) ...
@@ -583,10 +584,11 @@ Setting up cron (3.0pl1-91) ...
 Installing new version of config file /etc/cron.daily/standard ...
 Installing new version of config file /etc/pam.d/cron ...
 
-Setting up exim4-config (4.54-1) ...
+Setting up exim4-config (4.54-2) ...
 Installing new version of config file /etc/exim4/conf.d/acl/30_exim4-config_check_rcpt ...
 Installing new version of config file /etc/exim4/conf.d/router/150_exim4-config_hubbed_hosts ...
 Installing new version of config file /etc/exim4/conf.d/router/300_exim4-config_real_local ...
+Installing new version of config file /etc/exim4/conf.d/router/200_exim4-config_primary ...
 Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
 Installing new version of config file /etc/exim4/conf.d/rewrite/31_exim4-config_rewriting ...
 Installing new version of config file /etc/exim4/conf.d/main/03_exim4-config_tlsoptions ...
@@ -602,11 +604,11 @@ Installing new version of config file /etc/protocols ...
 Installing new version of config file /etc/init.d/networking ...
 Installing new version of config file /etc/services ...
 
-Setting up exim4-base (4.54-1) ...
+Setting up exim4-base (4.54-2) ...
 Installing new version of config file /etc/cron.daily/exim4-base ...
 Installing new version of config file /etc/init.d/exim4 ...
 
-Setting up exim4-daemon-light (4.54-1) ...
+Setting up exim4-daemon-light (4.54-2) ...
 
 Setting up libperl5.8 (5.8.7-7) ...
 
@@ -674,7 +676,7 @@ Setting up cpp-4.0 (4.0.2-2) ...
 Setting up cpp (4.0.2-1) ...
 Setting up make (3.80-11) ...
 
-Setting up exim4 (4.54-1) ...
+Setting up exim4 (4.54-2) ...
 Setting up gcc-4.0 (4.0.2-2) ...
 Setting up gcc (4.0.2-1) ...
 
@@ -728,6 +730,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//21738 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//10761 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 3bef464..afd4ebe 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/22943/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/12683/etc/mtab': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -24,7 +24,7 @@ The following NEW packages will be installed:
 Need to get 0B/131kB of archives.
 After unpacking 737kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11821 files and directories currently installed.)
+(Reading database ... 11815 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.35_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.35_amd64.deb) ...
@@ -59,7 +59,7 @@ The following NEW packages will be installed:
 Need to get 0B/2890kB of archives.
 After unpacking 9572kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11914 files and directories currently installed.)
+(Reading database ... 11908 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -100,12 +100,12 @@ Building dependency tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/94.1kB of archives.
+Need to get 0B/94.3kB of archives.
 After unpacking 360kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12505 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.5.4_amd64.deb) ...
-Setting up fakeroot (1.5.4) ...
+(Reading database ... 12499 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
+Setting up fakeroot (1.5.5) ...
 
 dpkg-buildpackage: source package is dsh
 dpkg-buildpackage: source version is 0.25.6-1
@@ -116,14 +116,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -311,18 +311,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -335,26 +335,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -392,8 +392,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -405,7 +405,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:19:40 UTC 2005
+Wed Nov 16 04:41:33 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -475,7 +475,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:19:45 UTC 2005
+Wed Nov 16 04:41:38 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -491,9 +491,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -501,58 +501,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -576,6 +576,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/22943 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/12683 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sarge.log b/testsuite/normal/pdebuild-internal-sarge.log
index fc0d33e..a5f710a 100644
--- a/testsuite/normal/pdebuild-internal-sarge.log
+++ b/testsuite/normal/pdebuild-internal-sarge.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/14200/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/3004/etc/mtab': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -110,14 +110,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -305,18 +305,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -329,26 +329,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -399,7 +399,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:10:16 UTC 2005
+Wed Nov 16 04:31:42 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -469,14 +469,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:10:21 UTC 2005
+Wed Nov 16 04:31:47 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -485,9 +485,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -495,58 +495,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -570,6 +570,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/14200 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/3004 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 8935121..cd9ba24 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/14062/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/21658/etc/mtab': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -24,16 +24,16 @@ The following NEW packages will be installed:
 Need to get 0B/133kB of archives.
 After unpacking 741kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11831 files and directories currently installed.)
-Unpacking libdebian-installer4 (from .../libdebian-installer4_0.35_amd64.deb) ...
+(Reading database ... 11858 files and directories currently installed.)
+Unpacking libdebian-installer4 (from .../libdebian-installer4_0.36_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
-Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.35_amd64.deb) ...
+Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.36_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.3.9_amd64.deb) ...
 Selecting previously deselected package pbuilder.
 Unpacking pbuilder (from .../pbuilder_0.138_all.deb) ...
-Setting up libdebian-installer4 (0.35) ...
-Setting up libdebian-installer-extra4 (0.35) ...
+Setting up libdebian-installer4 (0.36) ...
+Setting up libdebian-installer-extra4 (0.36) ...
 Setting up cdebootstrap (0.3.9) ...
 Setting up pbuilder (0.138) ...
 Setting DEBBUILDOPTS=
@@ -59,7 +59,7 @@ The following NEW packages will be installed:
 Need to get 0B/2892kB of archives.
 After unpacking 9572kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11925 files and directories currently installed.)
+(Reading database ... 11952 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -74,7 +74,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.0_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.6_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.7_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -90,7 +90,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.0) ...
-Setting up debhelper (5.0.6) ...
+Setting up debhelper (5.0.7) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -103,7 +103,7 @@ The following NEW packages will be installed:
 Need to get 0B/94.3kB of archives.
 After unpacking 360kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12516 files and directories currently installed.)
+(Reading database ... 12543 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
@@ -116,14 +116,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -312,18 +312,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -336,26 +336,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -406,7 +406,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:05:03 UTC 2005
+Wed Nov 16 04:23:17 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -419,18 +419,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -445,6 +433,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -476,7 +476,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:05:08 UTC 2005
+Wed Nov 16 04:23:22 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -492,9 +492,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -504,58 +504,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -593,6 +593,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/14062 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/21658 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index ab27d47..4b90ecd 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -30,14 +30,14 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:17:51 JST 2005
-pbuilder-time-stamp: 1132024671
+Current time: Wed Nov 16 13:39:44 JST 2005
+pbuilder-time-stamp: 1132115984
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/15969/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/5627/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -65,7 +65,7 @@ The following NEW packages will be installed:
 Need to get 0B/2890kB of archives.
 After unpacking 9572kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11821 files and directories currently installed.)
+(Reading database ... 11815 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -102,7 +102,6 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/15969/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -410,10 +409,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -421,11 +420,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-1: 1
 2: 2
+1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:18:40 UTC 2005
+Wed Nov 16 04:40:32 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -495,14 +494,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:18:45 UTC 2005
+Wed Nov 16 04:40:37 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -608,7 +607,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:18:47 JST 2005
-pbuilder-time-stamp: 1132024727
+Current time: Wed Nov 16 13:40:39 JST 2005
+pbuilder-time-stamp: 1132116039
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/15969 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/5627 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index e500ce2..082f886 100644
--- a/testsuite/normal/pdebuild-normal-sarge.log
+++ b/testsuite/normal/pdebuild-normal-sarge.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -30,14 +30,14 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:08:39 JST 2005
-pbuilder-time-stamp: 1132024119
+Current time: Wed Nov 16 13:30:02 JST 2005
+pbuilder-time-stamp: 1132115402
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/7228/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/28412/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -102,7 +102,6 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/7228/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -409,9 +408,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -423,7 +422,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:09:19 UTC 2005
+Wed Nov 16 04:30:48 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -493,14 +492,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:09:24 UTC 2005
+Wed Nov 16 04:30:53 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -606,7 +605,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:09:26 JST 2005
-pbuilder-time-stamp: 1132024166
+Current time: Wed Nov 16 13:30:55 JST 2005
+pbuilder-time-stamp: 1132115455
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/7228 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/28412 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 761f9f1..5688638 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -30,14 +30,14 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Tue Nov 15 12:03:20 JST 2005
-pbuilder-time-stamp: 1132023800
+Current time: Wed Nov 16 13:19:34 JST 2005
+pbuilder-time-stamp: 1132114774
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/7087/etc/mtab': File exists
+ln: `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/12730/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -65,7 +65,7 @@ The following NEW packages will be installed:
 Need to get 0B/2892kB of archives.
 After unpacking 9572kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11831 files and directories currently installed.)
+(Reading database ... 11858 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -80,7 +80,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.0_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.6_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.7_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -96,13 +96,12 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.0) ...
-Setting up debhelper (5.0.6) ...
+Setting up debhelper (5.0.7) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/7087/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -426,7 +425,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Nov 15 03:04:05 UTC 2005
+Wed Nov 16 04:20:56 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -496,14 +495,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Nov 15 03:04:10 UTC 2005
+Wed Nov 16 04:21:01 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
 c: c
 dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -625,7 +624,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Tue Nov 15 12:04:12 JST 2005
-pbuilder-time-stamp: 1132023852
+Current time: Wed Nov 16 13:21:06 JST 2005
+pbuilder-time-stamp: 1132114866
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.jKvntF/dir2/7087 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PLvRy7/dir2/12730 and its subdirectories