successful

author: dancer <dancer> 2006-04-09 02:21:51 +0000
committer: dancer <dancer> 2006-04-09 02:21:51 +0000
commit: 2145b0b4313e3ee3abd2c0a4649d6663961ccb2f (patch)
tree: 7a885f381a3c4795bc05c74f844774101b7c1ee0 /testsuite
parent: 0085d7461a7d1191a2fee4f035b0e7f6370871ef (diff)
download: pbuilder-2145b0b4313e3ee3abd2c0a4649d6663961ccb2f.tar
pbuilder-2145b0b4313e3ee3abd2c0a4649d6663961ccb2f.tar.gz
40 files changed, 1497 insertions, 1421 deletions
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index c422d44..f70f2e4 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 13:03:16 JST 2006
-pbuilder-time-stamp: 1144036996
+Current time: Sat Apr  8 12:44:21 JST 2006
+pbuilder-time-stamp: 1144467861
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2840/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/32126/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -40,7 +40,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11040 files and directories currently installed.)
+(Reading database ... 11048 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
@@ -86,17 +86,17 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11694 files and directories currently installed.)
+(Reading database ... 11702 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2840/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2840/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/32126/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/32126/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -415,11 +415,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
-Mon Apr  3 04:04:09 UTC 2006
+Sat Apr  8 03:45:34 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -489,7 +489,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
-Mon Apr  3 04:04:14 UTC 2006
+Sat Apr  8 03:45:39 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -619,7 +619,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: Mon Apr  3 13:04:17 JST 2006
-pbuilder-time-stamp: 1144037057
+Current time: Sat Apr  8 12:45:42 JST 2006
+pbuilder-time-stamp: 1144467942
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2840 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/32126 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
index a4d2c7c..df72ac5 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 12:54:06 JST 2006
-pbuilder-time-stamp: 1144036446
+Current time: Sat Apr  8 12:33:09 JST 2006
+pbuilder-time-stamp: 1144467189
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/19452/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/15503/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -86,12 +86,12 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/19452/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/19452/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/15503/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/15503/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -395,8 +395,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
@@ -409,7 +409,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
-Mon Apr  3 03:54:52 UTC 2006
+Sat Apr  8 03:34:04 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -479,14 +479,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
-Mon Apr  3 03:54:57 UTC 2006
+Sat Apr  8 03:34:09 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
 a: a
 b: b
+dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -592,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: Mon Apr  3 12:54:59 JST 2006
-pbuilder-time-stamp: 1144036499
+Current time: Sat Apr  8 12:34:11 JST 2006
+pbuilder-time-stamp: 1144467251
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/19452 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/15503 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 982a7fd..413ed0f 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 12:47:08 JST 2006
-pbuilder-time-stamp: 1144036028
+Current time: Sat Apr  8 12:26:11 JST 2006
+pbuilder-time-stamp: 1144466771
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/12453/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/9564/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -40,7 +40,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11096 files and directories currently installed.)
+(Reading database ... 11106 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
@@ -86,17 +86,17 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11750 files and directories currently installed.)
+(Reading database ... 11760 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/12453/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/12453/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/9564/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/9564/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -380,6 +380,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
@@ -418,7 +419,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
-Mon Apr  3 03:48:00 UTC 2006
+Sat Apr  8 03:27:18 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -488,14 +489,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
-Mon Apr  3 03:48:05 UTC 2006
+Sat Apr  8 03:27:23 UTC 2006
 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
-b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -618,7 +619,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: Mon Apr  3 12:48:08 JST 2006
-pbuilder-time-stamp: 1144036088
+Current time: Sat Apr  8 12:27:25 JST 2006
+pbuilder-time-stamp: 1144466845
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/12453 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/9564 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index c3e8027..b1411c1 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -11,8 +11,8 @@ P: Parsing Packages
 W: can't find package: base-config
 P: Retrieving libc6
 P: Validating libc6
-P: Retrieving gcc-4.0-base
-P: Validating gcc-4.0-base
+P: Retrieving gcc-4.1-base
+P: Validating gcc-4.1-base
 P: Retrieving libgcc1
 P: Validating libgcc1
 P: Retrieving libstdc++6
@@ -183,6 +183,8 @@ P: Retrieving logrotate
 P: Validating logrotate
 P: Retrieving procps
 P: Validating procps
+P: Retrieving gcc-4.0-base
+P: Validating gcc-4.0-base
 P: Retrieving hostname
 P: Validating hostname
 P: Retrieving libuuid1
@@ -230,7 +232,7 @@ P: Validating findutils
 P: Retrieving makedev
 P: Validating makedev
 P: Extracting libc6
-P: Extracting gcc-4.0-base
+P: Extracting gcc-4.1-base
 P: Extracting libgcc1
 P: Extracting libstdc++6
 P: Extracting libdb4.3
@@ -263,6 +265,7 @@ P: Extracting passwd
 P: Extracting libslang2
 P: Extracting base-passwd
 P: Extracting procps
+P: Extracting gcc-4.0-base
 P: Extracting hostname
 P: Extracting libuuid1
 P: Extracting util-linux
@@ -298,14 +301,16 @@ P: Configuring package base-passwd
 O: 
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 24 files and directories currently installed.)
+O: (Reading database ... 
+O: 24 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'
 O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
-O: (Reading database ... 29 files and directories currently installed.)
+O: (Reading database ... 
+O: 29 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
@@ -333,14 +338,14 @@ O: (Reading database ...
 O: 196 files and directories currently installed.)
 O: Unpacking libc6 (from .../libc6_2.3.6-3_amd64.deb) ...
 P: Unpacking package libc6
-O: Selecting previously deselected package gcc-4.0-base.
-O: Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
-P: Unpacking package gcc-4.0-base
+O: Selecting previously deselected package gcc-4.1-base.
+O: Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
+P: Unpacking package gcc-4.1-base
 O: Selecting previously deselected package libgcc1.
-O: Unpacking libgcc1 (from .../libgcc1_4.0.3-1_amd64.deb) ...
+O: Unpacking libgcc1 (from .../libgcc1_4.1.0-1_amd64.deb) ...
 P: Unpacking package libgcc1
 O: Selecting previously deselected package libstdc++6.
-O: Unpacking libstdc++6 (from .../libstdc++6_4.0.3-1_amd64.deb) ...
+O: Unpacking libstdc++6 (from .../libstdc++6_4.1.0-1_amd64.deb) ...
 P: Unpacking package libstdc++6
 O: Selecting previously deselected package libdb4.3.
 O: Unpacking libdb4.3 (from .../libdb4.3_4.3.29-4.1_amd64.deb) ...
@@ -451,10 +456,10 @@ O: Selecting previously deselected package libpam0g.
 O: Unpacking libpam0g (from .../libpam0g_0.79-3.1_amd64.deb) ...
 P: Unpacking package libpam0g
 O: Selecting previously deselected package libsepol1.
-O: Unpacking libsepol1 (from .../libsepol1_1.10-2_amd64.deb) ...
+O: Unpacking libsepol1 (from .../libsepol1_1.12-1_amd64.deb) ...
 P: Unpacking package libsepol1
 O: Selecting previously deselected package libselinux1.
-O: Unpacking libselinux1 (from .../libselinux1_1.28-4_amd64.deb) ...
+O: Unpacking libselinux1 (from .../libselinux1_1.30-1_amd64.deb) ...
 P: Unpacking package libselinux1
 O: Selecting previously deselected package libcap1.
 O: Unpacking libcap1 (from .../libcap1_1.10-14_amd64.deb) ...
@@ -486,6 +491,9 @@ P: Unpacking package libslang2
 O: Selecting previously deselected package procps.
 O: Unpacking procps (from .../procps_3.2.6-2.1_amd64.deb) ...
 P: Unpacking package procps
+O: Selecting previously deselected package gcc-4.0-base.
+O: Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
+P: Unpacking package gcc-4.0-base
 O: Selecting previously deselected package hostname.
 O: dpkg: regarding .../hostname_2.92_amd64.deb containing hostname, pre-dependency problem:
 O:  hostname pre-depends on libc6 (>= 2.3.5-1)
@@ -615,21 +623,21 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking e2fsprogs (from .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 P: Unpacking package e2fsprogs
 O: Selecting previously deselected package initscripts.
-O: Unpacking initscripts (from .../initscripts_2.86.ds1-13_amd64.deb) ...
+O: Unpacking initscripts (from .../initscripts_2.86.ds1-14_amd64.deb) ...
 P: Unpacking package initscripts
 O: Selecting previously deselected package sysv-rc.
-O: Unpacking sysv-rc (from .../sysv-rc_2.86.ds1-13_all.deb) ...
+O: Unpacking sysv-rc (from .../sysv-rc_2.86.ds1-14_all.deb) ...
 P: Unpacking package sysv-rc
 O: Selecting previously deselected package sysvinit.
-O: dpkg: regarding .../sysvinit_2.86.ds1-13_amd64.deb containing sysvinit, pre-dependency problem:
+O: dpkg: regarding .../sysvinit_2.86.ds1-14_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-13_amd64.deb containing sysvinit, pre-dependency problem:
+O: dpkg: regarding .../sysvinit_2.86.ds1-14_amd64.deb containing sysvinit, pre-dependency problem:
 O:  sysvinit pre-depends on sysv-rc (>= 2.86.ds1-1.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-13_amd64.deb) ...
+O: Unpacking sysvinit (from .../sysvinit_2.86.ds1-14_amd64.deb) ...
 P: Unpacking package sysvinit
 O: Selecting previously deselected package base-files.
 O: Unpacking base-files (from .../base-files_3.1.11_amd64.deb) ...
@@ -658,12 +666,15 @@ P: Unpacking package makedev
 O: Setting up makedev (2.3.1-80) ...
 P: Configuring package makedev
 O: 
-O: Setting up sysv-rc (2.86.ds1-13) ...
+O: Setting up sysv-rc (2.86.ds1-14) ...
 P: Configuring package sysv-rc
 O: 
 O: Setting up gcc-4.0-base (4.0.3-1) ...
 P: Configuring package gcc-4.0-base
 O: 
+O: Setting up gcc-4.1-base (4.1.0-1) ...
+P: Configuring package gcc-4.1-base
+O: 
 O: Setting up libpam-runtime (0.79-3.1) ...
 P: Configuring package libpam-runtime
 O: 
@@ -685,7 +696,7 @@ P: Configuring package bsdutils
 O: 
 O: Setting up perl-base (5.8.8-3) ...
 P: Configuring package perl-base
-O: Setting up libsepol1 (1.10-2) ...
+O: Setting up libsepol1 (1.12-1) ...
 P: Configuring package libsepol1
 O: 
 O: Setting up tar (1.15.1-6) ...
@@ -695,7 +706,7 @@ O:
 O: Setting up zlib1g (1.2.3-11) ...
 P: Configuring package zlib1g
 O: 
-O: Setting up libgcc1 (4.0.3-1) ...
+O: Setting up libgcc1 (4.1.0-1) ...
 P: Configuring package libgcc1
 O: 
 O: Setting up libtext-iconv-perl (1.4-2) ...
@@ -746,10 +757,10 @@ O: Setting up liblocale-gettext-perl (1.05-1) ...
 P: Configuring package liblocale-gettext-perl
 O: Setting up diff (2.8.1-11) ...
 P: Configuring package diff
-O: Setting up libselinux1 (1.28-4) ...
+O: Setting up libselinux1 (1.30-1) ...
 P: Configuring package libselinux1
 O: 
-O: Setting up libstdc++6 (4.0.3-1) ...
+O: Setting up libstdc++6 (4.1.0-1) ...
 P: Configuring package libstdc++6
 O: 
 O: Setting up libtext-charwidth-perl (0.04-3) ...
@@ -794,13 +805,13 @@ P: Configuring package lsb-base
 O: Setting up passwd (4.0.14-9) ...
 P: Configuring package passwd
 O: 
-O: Setting up initscripts (2.86.ds1-13) ...
+O: Setting up initscripts (2.86.ds1-14) ...
 P: Configuring package initscripts
 O: 
 O: Setting up util-linux (2.12r-8) ...
 P: Configuring package util-linux
 O: 
-O: Setting up sysvinit (2.86.ds1-13) ...
+O: Setting up sysvinit (2.86.ds1-14) ...
 P: Configuring package sysvinit
 O: sysvinit: creating /dev/initctl
 O: init: timeout opening/writing control channel /dev/initctl
@@ -812,7 +823,7 @@ P: Configuring package debconf
 O: 
 O: Selecting previously deselected package apt.
 O: (Reading database ... 
-O: 4549 files and directories currently installed.)
+O: 4557 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.6.43.3_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.43.3) ...
@@ -821,13 +832,13 @@ O:
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
 O: (Reading database ... 
-O: 4725 files and directories currently installed.)
+O: 4733 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 O: Get:1 bootstrap: . Release.gpg [189B]
 O: Get:2 bootstrap: . Release [5902B]
 O: Ign bootstrap: . Release
-O: Fetched 6091B in 0s (50.5kB/s)
+O: Fetched 6091B in 0s (49.7kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -869,7 +880,7 @@ O:   exim4-daemon-light at exim4 telnet dhcp3-common dhcp3-client psmisc
 O: Authentication warning overridden.
 O: Selecting previously deselected package adduser.
 O: (Reading database ... 
-O: 4726 files and directories currently installed.)
+O: 4734 files and directories currently installed.)
 O: Unpacking adduser (from .../bootstrap/adduser_3.85_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package apt-utils.
@@ -909,7 +920,7 @@ O: Selecting previously deselected package ifupdown.
 O: Unpacking ifupdown (from .../ifupdown_0.6.7_amd64.deb) ...
 P: Unpacking package ifupdown
 O: Selecting previously deselected package info.
-O: Unpacking info (from .../bootstrap/info_4.8-6_amd64.deb) ...
+O: Unpacking info (from .../bootstrap/info_4.8-8_amd64.deb) ...
 P: Unpacking package info
 O: Selecting previously deselected package iptables.
 O: Unpacking iptables (from .../iptables_1.3.3-2_amd64.deb) ...
@@ -1070,7 +1081,7 @@ O:
 O: ifupdown.postinst: Warning: No 'iface lo' definition found in /etc/network/interfaces
 O: ifupdown.postinst: Warning: No 'auto lo' statement found in /etc/network/interfaces
 O: 
-O: Setting up info (4.8-6) ...
+O: Setting up info (4.8-8) ...
 P: Configuring package info
 O: 
 O: Setting up iptables (1.3.3-2) ...
@@ -1192,18 +1203,18 @@ P: Configuring package telnet
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 6679 files and directories currently installed.)
+O: 6687 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 6678 files and directories currently installed.)
+O: 6686 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: 6676 files and directories currently installed.)
+O: 6684 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1216,18 +1227,18 @@ umount: /proc/bus/usb: not found
 umount: /dev/shm: not mounted
 umount: /proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//16569/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//13287/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//16569/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//13287/etc/mtab' to `../proc/mounts': File exists
  -> 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 [5902B]
 Ign http://ftp.jp.debian.org etch Release
-Get:3 http://ftp.jp.debian.org etch/main Packages [3730kB]
-Fetched 3736kB in 1s (2021kB/s)
+Get:3 http://ftp.jp.debian.org etch/main Packages [3738kB]
+Fetched 3744kB in 1s (1886kB/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
@@ -1261,7 +1272,7 @@ WARNING: The following packages cannot be authenticated!
   gcc linux-kernel-headers libc6-dev libstdc++6-4.0-dev g++-4.0 g++
   build-essential
 Selecting previously deselected package binutils.
-(Reading database ... 6676 files and directories currently installed.)
+(Reading database ... 6684 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.3-1_amd64.deb) ...
@@ -1325,9 +1336,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//16569/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//13287/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//16569 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13287 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sarge.log b/testsuite/cdebootstrap/pbuilder-create-sarge.log
index 80e22d6..0207a01 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sarge.log
@@ -758,8 +758,7 @@ O: Architecture-specific modutils configuration not found, using defaults
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 
-O: 4193 files and directories currently installed.)
+O: (Reading database ... 4193 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
@@ -788,6 +787,7 @@ O:
 O: Reading Package Lists...
 O: 
 O: Reading Package Lists...
+O: 
 O: Building Dependency Tree...
 O: 
 O: Suggested packages:
@@ -1216,16 +1216,16 @@ umount: /proc/bus/usb: not found
 umount: /dev/shm: not mounted
 umount: /proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//2566/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//30992/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//2566/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//30992/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> 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 (1940kB/s)
+Fetched 3223kB in 1s (1780kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -1312,9 +1312,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] [pid | job]... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//2566/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//30992/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//2566 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//30992 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index c6a979d..2ddf15f 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -339,7 +339,7 @@ O:
 O: Selecting previously deselected package libc6.
 O: (Reading database ... 
 O: 192 files and directories currently installed.)
-O: Unpacking libc6 (from .../libc6_2.3.6-4_amd64.deb) ...
+O: Unpacking libc6 (from .../libc6_2.3.6-5_amd64.deb) ...
 P: Unpacking package libc6
 O: Selecting previously deselected package gcc-4.1-base.
 O: Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
@@ -383,22 +383,22 @@ 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.3_amd64.deb containing debianutils, pre-dependency problem:
+O: dpkg: regarding .../debianutils_2.15.4_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.3_amd64.deb containing debianutils, pre-dependency problem:
+O: dpkg: regarding .../debianutils_2.15.4_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.3_amd64.deb) ...
+O: Unpacking debianutils (from .../debianutils_2.15.4_amd64.deb) ...
 P: Unpacking package debianutils
 O: Selecting previously deselected package perl-base.
-O: dpkg: regarding .../perl-base_5.8.8-3_amd64.deb containing perl-base, pre-dependency problem:
+O: dpkg: regarding .../perl-base_5.8.8-4_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.8-3_amd64.deb) ...
+O: Unpacking perl-base (from .../perl-base_5.8.8-4_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:
@@ -431,11 +431,11 @@ O: Selecting previously deselected package debconf-i18n.
 O: Unpacking debconf-i18n (from .../debconf-i18n_1.4.72_all.deb) ...
 P: Unpacking package debconf-i18n
 O: Selecting previously deselected package sed.
-O: dpkg: regarding .../sed_4.1.4-5_amd64.deb containing sed, pre-dependency problem:
+O: dpkg: regarding .../sed_4.1.4-7_amd64.deb containing sed, pre-dependency problem:
 O:  sed 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 sed (from .../sed_4.1.4-5_amd64.deb) ...
+O: Unpacking sed (from .../sed_4.1.4-7_amd64.deb) ...
 P: Unpacking package sed
 O: Selecting previously deselected package libncurses5.
 O: Unpacking libncurses5 (from .../libncurses5_5.5-1_amd64.deb) ...
@@ -477,22 +477,22 @@ O: Selecting previously deselected package libpam-modules.
 O: Unpacking libpam-modules (from .../libpam-modules_0.79-3.1_amd64.deb) ...
 P: Unpacking package libpam-modules
 O: Selecting previously deselected package login.
-O: dpkg: regarding .../login_4.0.15-1_amd64.deb containing login, pre-dependency problem:
+O: dpkg: regarding .../login_4.0.15-3_amd64.deb containing login, pre-dependency problem:
 O:  login 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 .../login_4.0.15-1_amd64.deb containing login, pre-dependency problem:
+O: dpkg: regarding .../login_4.0.15-3_amd64.deb containing login, pre-dependency problem:
 O:  login pre-depends on libpam0g (>= 0.76)
 O:   libpam0g is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../login_4.0.15-1_amd64.deb containing login, pre-dependency problem:
+O: dpkg: regarding .../login_4.0.15-3_amd64.deb containing login, pre-dependency problem:
 O:  login pre-depends on libpam-runtime (>= 0.76-14)
 O:   libpam-runtime is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking login (from .../login_4.0.15-1_amd64.deb) ...
+O: Unpacking login (from .../login_4.0.15-3_amd64.deb) ...
 P: Unpacking package login
 O: Selecting previously deselected package passwd.
-O: Unpacking passwd (from .../passwd_4.0.15-1_amd64.deb) ...
+O: Unpacking passwd (from .../passwd_4.0.15-3_amd64.deb) ...
 P: Unpacking package passwd
 O: Selecting previously deselected package libslang2.
 O: Unpacking libslang2 (from .../libslang2_2.0.6-2_amd64.deb) ...
@@ -545,7 +545,7 @@ O: Selecting previously deselected package procps.
 O: Unpacking procps (from .../procps_3.2.6-2.1_amd64.deb) ...
 P: Unpacking package procps
 O: Selecting previously deselected package libcomerr2.
-O: Unpacking libcomerr2 (from .../libcomerr2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
+O: Unpacking libcomerr2 (from .../libcomerr2_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
 P: Unpacking package libcomerr2
 O: Selecting previously deselected package dselect.
 O: Unpacking dselect (from .../dselect_1.13.17_amd64.deb) ...
@@ -565,13 +565,13 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking gzip (from .../gzip_1.3.5-12_amd64.deb) ...
 P: Unpacking package gzip
 O: Selecting previously deselected package libss2.
-O: Unpacking libss2 (from .../libss2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
+O: Unpacking libss2 (from .../libss2_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
 P: Unpacking package libss2
 O: Selecting previously deselected package libblkid1.
-O: Unpacking libblkid1 (from .../libblkid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
+O: Unpacking libblkid1 (from .../libblkid1_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
 P: Unpacking package libblkid1
 O: Selecting previously deselected package libuuid1.
-O: Unpacking libuuid1 (from .../libuuid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
+O: Unpacking libuuid1 (from .../libuuid1_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
 P: Unpacking package libuuid1
 O: Selecting previously deselected package mount.
 O: dpkg: regarding .../mount_2.12r-8_amd64.deb containing mount, pre-dependency problem:
@@ -589,34 +589,46 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking mount (from .../mount_2.12r-8_amd64.deb) ...
 P: Unpacking package mount
 O: Selecting previously deselected package e2fslibs.
-O: Unpacking e2fslibs (from .../e2fslibs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
+O: Unpacking e2fslibs (from .../e2fslibs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
 P: Unpacking package e2fslibs
 O: Selecting previously deselected package e2fsprogs.
-O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb containing e2fsprogs, pre-dependency problem:
-O:  e2fsprogs pre-depends on e2fslibs (= 1.38+1.39-WIP-2005.12.31-1)
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb containing e2fsprogs, pre-dependency problem:
+O:  e2fsprogs pre-depends on e2fslibs (= 1.38+1.39-WIP-2006.03.29-2.1)
 O:   e2fslibs is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb containing e2fsprogs, pre-dependency problem:
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs pre-depends on libblkid1 (>= 1.34-1)
 O:   libblkid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb containing e2fsprogs, pre-dependency problem:
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs 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 .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb containing e2fsprogs, pre-dependency problem:
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs pre-depends on libcomerr2 (>= 1.34-1)
 O:   libcomerr2 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb containing e2fsprogs, pre-dependency problem:
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb containing e2fsprogs, pre-dependency problem:
+O:  e2fsprogs pre-depends on libdevmapper1.02 (>= 2:1.02.02-2)
+O:   libdevmapper1.02 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb containing e2fsprogs, pre-dependency problem:
+O:  e2fsprogs pre-depends on libselinux1 (>= 1.30)
+O:   libselinux1 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb containing e2fsprogs, pre-dependency problem:
+O:  e2fsprogs pre-depends on libsepol1 (>= 1.12)
+O:   libsepol1 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs pre-depends on libss2 (>= 1.34-1)
 O:   libss2 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb containing e2fsprogs, pre-dependency problem:
+O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs pre-depends on libuuid1 (>= 1.34-1)
 O:   libuuid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking e2fsprogs (from .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
+O: Unpacking e2fsprogs (from .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
 P: Unpacking package e2fsprogs
 O: Selecting previously deselected package initscripts.
 O: Unpacking initscripts (from .../initscripts_2.86.ds1-14_amd64.deb) ...
@@ -693,14 +705,14 @@ O:
 O: Setting up libpam-runtime (0.79-3.1) ...
 P: Configuring package libpam-runtime
 O: 
-O: Setting up libc6 (2.3.6-4) ...
+O: Setting up libc6 (2.3.6-5) ...
 P: Configuring package libc6
 O: Non-interactive mode, setting timezone to UTC.  Run tzconfig to change.
 O: 
 O: Setting up libcap1 (1.10-14) ...
 P: Configuring package libcap1
 O: 
-O: Setting up libuuid1 (1.38+1.39-WIP-2005.12.31-1) ...
+O: Setting up libuuid1 (1.38+1.39-WIP-2006.03.29-2.1) ...
 P: Configuring package libuuid1
 O: 
 O: Setting up libpam0g (0.79-3.1) ...
@@ -709,7 +721,7 @@ O:
 O: Setting up bsdutils (2.12r-8) ...
 P: Configuring package bsdutils
 O: 
-O: Setting up perl-base (5.8.8-3) ...
+O: Setting up perl-base (5.8.8-4) ...
 P: Configuring package perl-base
 O: Setting up libsepol1 (1.12-1) ...
 P: Configuring package libsepol1
@@ -732,13 +744,13 @@ O:
 O: Setting up libattr1 (2.4.32-1) ...
 P: Configuring package libattr1
 O: 
-O: Setting up sed (4.1.4-5) ...
+O: Setting up sed (4.1.4-7) ...
 P: Configuring package sed
 O: 
-O: Setting up e2fslibs (1.38+1.39-WIP-2005.12.31-1) ...
+O: Setting up e2fslibs (1.38+1.39-WIP-2006.03.29-2.1) ...
 P: Configuring package e2fslibs
 O: 
-O: Setting up libcomerr2 (1.38+1.39-WIP-2005.12.31-1) ...
+O: Setting up libcomerr2 (1.38+1.39-WIP-2006.03.29-2.1) ...
 P: Configuring package libcomerr2
 O: 
 O: Setting up mawk (1.3.3-11) ...
@@ -757,17 +769,12 @@ O:
 O: Setting up libslang2 (2.0.6-2) ...
 P: Configuring package libslang2
 O: 
-O: Setting up libblkid1 (1.38+1.39-WIP-2005.12.31-1) ...
-P: Configuring package libblkid1
-O: 
-O: Setting up libss2 (1.38+1.39-WIP-2005.12.31-1) ...
+O: Setting up libss2 (1.38+1.39-WIP-2006.03.29-2.1) ...
 P: Configuring package libss2
 O: 
 O: Setting up findutils (4.2.27-1) ...
 P: Configuring package findutils
 O: 
-O: Setting up e2fsprogs (1.38+1.39-WIP-2005.12.31-1) ...
-P: Configuring package e2fsprogs
 O: Setting up liblocale-gettext-perl (1.05-1) ...
 P: Configuring package liblocale-gettext-perl
 O: Setting up diff (2.8.1-11) ...
@@ -788,7 +795,7 @@ P: Configuring package libtext-wrapi18n-perl
 O: Setting up coreutils (5.94-1) ...
 P: Configuring package coreutils
 O: 
-O: Setting up debianutils (2.15.3) ...
+O: Setting up debianutils (2.15.4) ...
 P: Configuring package debianutils
 O: 
 O: Setting up procps (3.2.6-2.1) ...
@@ -804,12 +811,14 @@ O:
 O: Setting up base-files (3.1.11) ...
 P: Configuring package base-files
 O: 
-O: Setting up mount (2.12r-8) ...
-P: Configuring package mount
-O: 
 O: Setting up libnewt0.52 (0.52.2-3) ...
 P: Configuring package libnewt0.52
 O: 
+O: Setting up libblkid1 (1.38+1.39-WIP-2006.03.29-2.1) ...
+P: Configuring package libblkid1
+O: 
+O: Setting up e2fsprogs (1.38+1.39-WIP-2006.03.29-2.1) ...
+P: Configuring package e2fsprogs
 O: Setting up gzip (1.3.5-12) ...
 P: Configuring package gzip
 O: 
@@ -818,12 +827,15 @@ P: Configuring package dselect
 O: Setting up bash (3.1-4) ...
 P: Configuring package bash
 O: 
-O: Setting up login (4.0.15-1) ...
+O: Setting up login (4.0.15-3) ...
 P: Configuring package login
 O: 
 O: Setting up lsb-base (3.0-16) ...
 P: Configuring package lsb-base
-O: Setting up passwd (4.0.15-1) ...
+O: Setting up mount (2.12r-8) ...
+P: Configuring package mount
+O: 
+O: Setting up passwd (4.0.15-3) ...
 P: Configuring package passwd
 O: 
 O: Setting up initscripts (2.86.ds1-14) ...
@@ -844,7 +856,7 @@ P: Configuring package debconf
 O: 
 O: Selecting previously deselected package apt.
 O: (Reading database ... 
-O: 4674 files and directories currently installed.)
+O: 4682 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.6.43.3_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.43.3) ...
@@ -853,13 +865,13 @@ O:
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
 O: (Reading database ... 
-O: 4848 files and directories currently installed.)
+O: 4856 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 O: Get:1 bootstrap: . Release.gpg [189B]
 O: Get:2 bootstrap: . Release [5902B]
 O: Ign bootstrap: . Release
-O: Fetched 6091B in 0s (47.2kB/s)
+O: Fetched 6091B in 0s (46.9kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -869,7 +881,9 @@ 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:
 O:   perl-modules libparse-debianchangelog-perl debtags cpp wenglish wordlist
 O:   whois vacation anacron lockfile-progs checksecurity resolvconf mail-reader
@@ -887,7 +901,7 @@ O:   libwrap0 logrotate man-db manpages nano net-tools netbase nvi openbsd-inetd
 O:   psmisc sysklogd tasksel tcpd telnet wget whiptail
 O: 0 upgraded, 51 newly installed, 0 to remove and 0 not upgraded.
 O: Need to get 13.7MB of archives.
-O: After unpacking 39.8MB of additional disk space will be used.
+O: After unpacking 39.9MB of additional disk space will be used.
 O: WARNING: The following packages cannot be authenticated!
 O:   adduser apt-utils libncursesw5 libsigc++-2.0-0c2a aptitude bsdmainutils cpio
 O:   cron dmidecode ed groff-base net-tools ifupdown info iptables iputils-ping
@@ -899,7 +913,7 @@ O:   telnet dhcp3-common dhcp3-client psmisc
 O: Authentication warning overridden.
 O: Selecting previously deselected package adduser.
 O: (Reading database ... 
-O: 4849 files and directories currently installed.)
+O: 4857 files and directories currently installed.)
 O: Unpacking adduser (from .../bootstrap/adduser_3.85_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package apt-utils.
@@ -921,7 +935,7 @@ O: Selecting previously deselected package cpio.
 O: Unpacking cpio (from .../cpio_2.6-11_amd64.deb) ...
 P: Unpacking package cpio
 O: Selecting previously deselected package cron.
-O: Unpacking cron (from .../cron_3.0pl1-93_amd64.deb) ...
+O: Unpacking cron (from .../cron_3.0pl1-94_amd64.deb) ...
 P: Unpacking package cron
 O: Selecting previously deselected package dmidecode.
 O: Unpacking dmidecode (from .../dmidecode_2.8-2_amd64.deb) ...
@@ -990,10 +1004,10 @@ 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.23-1_all.deb) ...
+O: Unpacking manpages (from .../manpages_2.25-1_all.deb) ...
 P: Unpacking package manpages
 O: Selecting previously deselected package nano.
-O: Unpacking nano (from .../nano_1.3.11-1_amd64.deb) ...
+O: Unpacking nano (from .../nano_1.3.11-2_amd64.deb) ...
 P: Unpacking package nano
 O: Selecting previously deselected package openbsd-inetd.
 O: Unpacking openbsd-inetd (from .../openbsd-inetd_0.20050402-1_amd64.deb) ...
@@ -1020,10 +1034,10 @@ O: Selecting previously deselected package libdb4.2.
 O: Unpacking libdb4.2 (from .../libdb4.2_4.2.52-24_amd64.deb) ...
 P: Unpacking package libdb4.2
 O: Selecting previously deselected package exim4-config.
-O: Unpacking exim4-config (from .../exim4-config_4.60-5_all.deb) ...
+O: Unpacking exim4-config (from .../exim4-config_4.61-1_all.deb) ...
 P: Unpacking package exim4-config
 O: Selecting previously deselected package exim4-base.
-O: Unpacking exim4-base (from .../exim4-base_4.60-5+b1_amd64.deb) ...
+O: Unpacking exim4-base (from .../exim4-base_4.61-1_amd64.deb) ...
 P: Unpacking package exim4-base
 O: Selecting previously deselected package libgnutls12.
 O: Unpacking libgnutls12 (from .../libgnutls12_1.2.9-2_amd64.deb) ...
@@ -1032,13 +1046,13 @@ O: Selecting previously deselected package libpcre3.
 O: Unpacking libpcre3 (from .../libpcre3_6.4-1.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.60-5+b1_amd64.deb) ...
+O: Unpacking exim4-daemon-light (from .../exim4-daemon-light_4.61-1_amd64.deb) ...
 P: Unpacking package exim4-daemon-light
 O: Selecting previously deselected package at.
 O: Unpacking at (from .../bootstrap/at_3.1.10_amd64.deb) ...
 P: Unpacking package at
 O: Selecting previously deselected package exim4.
-O: Unpacking exim4 (from .../bootstrap/exim4_4.60-5_all.deb) ...
+O: Unpacking exim4 (from .../bootstrap/exim4_4.61-1_all.deb) ...
 P: Unpacking package exim4
 O: Selecting previously deselected package telnet.
 O: Unpacking telnet (from .../telnet_0.17-32_amd64.deb) ...
@@ -1073,7 +1087,7 @@ O:
 O: Setting up cpio (2.6-11) ...
 P: Configuring package cpio
 O: 
-O: Setting up cron (3.0pl1-93) ...
+O: Setting up cron (3.0pl1-94) ...
 P: Configuring package cron
 O: Adding group `crontab' (101)...
 O: Done.
@@ -1139,9 +1153,9 @@ 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.23-1) ...
+O: Setting up manpages (2.25-1) ...
 P: Configuring package manpages
-O: Setting up nano (1.3.11-1) ...
+O: Setting up nano (1.3.11-2) ...
 P: Configuring package nano
 O: 
 O: Setting up tcpd (7.6.dbs-9) ...
@@ -1160,7 +1174,7 @@ O: Setting up whiptail (0.52.2-3) ...
 P: Configuring package whiptail
 O: Setting up libdb4.2 (4.2.52-24) ...
 P: Configuring package libdb4.2
-O: Setting up exim4-config (4.60-5) ...
+O: Setting up exim4-config (4.61-1) ...
 P: Configuring package exim4-config
 O: hostname: 
 O: Host name lookup failure
@@ -1200,34 +1214,34 @@ O:
 O: Setting up openbsd-inetd (0.20050402-1) ...
 P: Configuring package openbsd-inetd
 O: 
-O: Setting up exim4-base (4.60-5+b1) ...
+O: Setting up exim4-base (4.61-1) ...
 P: Configuring package exim4-base
 O: 
-O: Setting up exim4-daemon-light (4.60-5+b1) ...
+O: Setting up exim4-daemon-light (4.61-1) ...
 P: Configuring package exim4-daemon-light
 O: 
 O: Setting up at (3.1.10) ...
 P: Configuring package at
 O: 
-O: Setting up exim4 (4.60-5) ...
+O: Setting up exim4 (4.61-1) ...
 P: Configuring package exim4
 O: Setting up telnet (0.17-32) ...
 P: Configuring package telnet
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 6735 files and directories currently installed.)
+O: 6745 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 6734 files and directories currently installed.)
+O: 6744 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: 6732 files and directories currently installed.)
+O: 6742 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1240,18 +1254,18 @@ umount: /proc/bus/usb: not found
 umount: /dev/shm: not mounted
 umount: /proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//26078/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//23049/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//26078/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//23049/etc/mtab' to `../proc/mounts': File exists
  -> 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 [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [4028kB]
-Fetched 4034kB in 33s (121kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [4043kB]
+Fetched 4049kB in 2s (2007kB/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
@@ -1285,18 +1299,18 @@ WARNING: The following packages cannot be authenticated!
   gcc linux-kernel-headers libc6-dev libstdc++6-4.0-dev g++-4.0 g++
   build-essential
 Selecting previously deselected package binutils.
-(Reading database ... 6732 files and directories currently installed.)
+(Reading database ... 6742 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package cpp.
-Unpacking cpp (from .../cpp_4%3a4.0.3-1_amd64.deb) ...
+Unpacking cpp (from .../cpp_4%3a4.0.3-3_amd64.deb) ...
 Selecting previously deselected package perl-modules.
-Unpacking perl-modules (from .../perl-modules_5.8.8-3_all.deb) ...
+Unpacking perl-modules (from .../perl-modules_5.8.8-4_all.deb) ...
 Selecting previously deselected package libdb4.4.
 Unpacking libdb4.4 (from .../libdb4.4_4.4.20-4_amd64.deb) ...
 Selecting previously deselected package perl.
-Unpacking perl (from .../perl_5.8.8-3_amd64.deb) ...
+Unpacking perl (from .../perl_5.8.8-4_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package make.
@@ -1306,39 +1320,39 @@ Unpacking dpkg-dev (from .../dpkg-dev_1.13.17_all.deb) ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package gcc.
-Unpacking gcc (from .../gcc_4%3a4.0.3-1_amd64.deb) ...
+Unpacking gcc (from .../gcc_4%3a4.0.3-3_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
 Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-2.1_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.3.6-4_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.3.6-5_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.3-1_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
 Unpacking g++-4.0 (from .../g++-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package g++.
-Unpacking g++ (from .../g++_4%3a4.0.3-1_amd64.deb) ...
+Unpacking g++ (from .../g++_4%3a4.0.3-3_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.2_amd64.deb) ...
 Setting up binutils (2.16.1cvs20060117-1) ...
 
 Setting up cpp-4.0 (4.0.3-1) ...
-Setting up cpp (4.0.3-1) ...
+Setting up cpp (4.0.3-3) ...
 
 Setting up libdb4.4 (4.4.20-4) ...
 Setting up patch (2.5.9-4) ...
 Setting up make (3.80+3.81.rc2-1) ...
 Setting up gcc-4.0 (4.0.3-1) ...
-Setting up gcc (4.0.3-1) ...
+Setting up gcc (4.0.3-3) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-2.1) ...
-Setting up libc6-dev (2.3.6-4) ...
-Setting up perl-modules (5.8.8-3) ...
+Setting up libc6-dev (2.3.6-5) ...
+Setting up perl-modules (5.8.8-4) ...
 Setting up g++-4.0 (4.0.3-1) ...
 Setting up libstdc++6-4.0-dev (4.0.3-1) ...
 
-Setting up g++ (4.0.3-1) ...
+Setting up g++ (4.0.3-3) ...
 
-Setting up perl (5.8.8-3) ...
+Setting up perl (5.8.8-4) ...
 
 Setting up dpkg-dev (1.13.17) ...
 Setting up build-essential (11.2) ...
@@ -1349,9 +1363,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//26078/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//23049/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//26078 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23049 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index 34a87ce..7186a07 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//23201/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//20343/etc/mtab' to `../proc/mounts': 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//23201 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//20343 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sarge.log b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
index 69af107..3a13cf6 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//7247/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//3515/etc/mtab' to `../proc/mounts': 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//7247 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//3515 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index a88dad4..c20a46c 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//1724/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//30079/etc/mtab' to `../proc/mounts': 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//1724 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//30079 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 5e597e7..5231279 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//25918/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//23280/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,9 +18,9 @@ Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Ign http://ftp.jp.debian.org experimental Release
 Get:4 http://ftp.jp.debian.org sid Release [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [158kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [162kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 169kB in 0s (777kB/s)
+Fetched 172kB in 0s (694kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -38,15 +38,15 @@ Need to get 0B/2876kB of archives.
 After unpacking 303kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   diff lsb-base aptitude
-(Reading database ... 11090 files and directories currently installed.)
+(Reading database ... 11106 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 ... 11098 files and directories currently installed.)
+(Reading database ... 11114 files and directories currently installed.)
 Preparing to replace lsb-base 3.0-16 (using .../lsb-base_3.1-1_all.deb) ...
 Unpacking replacement lsb-base ...
 Setting up lsb-base (3.1-1) ...
-(Reading database ... 11098 files and directories currently installed.)
+(Reading database ... 11114 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Setting up aptitude (0.4.1-1experimental1) ...
@@ -70,10 +70,10 @@ Need to get 0B/1535kB of archives.
 After unpacking 9683kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
   apt-utils apt
-(Reading database ... 11098 files and directories currently installed.)
+(Reading database ... 11114 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 10893 files and directories currently installed.)
+(Reading database ... 10909 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.3 (using .../apt-utils_0.6.43.3exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.3 (using .../apt_0.6.43.3exp1_amd64.deb) ...
@@ -89,9 +89,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//25918/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//23280/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25918 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23280 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 2c43fd4..fae762d 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//24044/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//21255/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -13,8 +13,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [4028kB]
-Fetched 4034kB in 2s (1955kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [4043kB]
+Fetched 4049kB in 2s (1452kB/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,89 +25,102 @@ Building dependency tree...
 The following packages will be REMOVED:
   libnewt0.51
 The following NEW packages will be installed:
-  gcc-4.1-base libnewt0.52
+  libdevmapper1.02 libnewt0.52
 The following packages will be upgraded:
-  bash coreutils cpp dhcp3-client dhcp3-common dmidecode exim4 exim4-base
-  exim4-config exim4-daemon-light g++ gcc info initscripts klogd libacl1
-  libattr1 libc6 libc6-dev libdb4.2 libdb4.3 libdb4.4 libgcc1 libselinux1
-  libsepol1 libslang2 libssl0.9.8 libstdc++6 login manpages nano passwd
-  sysklogd sysv-rc sysvinit whiptail
-36 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/19.5MB of archives.
-After unpacking 1810kB of additional disk space will be used.
+  bash coreutils cpp cron debianutils dhcp3-client dhcp3-common dmidecode
+  e2fslibs e2fsprogs exim4 exim4-base exim4-config exim4-daemon-light g++ gcc
+  klogd libacl1 libattr1 libblkid1 libc6 libc6-dev libcomerr2 libdb4.2
+  libdb4.3 libdb4.4 libslang2 libss2 libssl0.9.8 libuuid1 login manpages nano
+  passwd perl perl-base perl-modules sed sysklogd whiptail
+40 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0B/27.0MB of archives.
+After unpacking 1954kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  libc6-dev libc6 libslang2 whiptail libnewt0.52 bash coreutils login
-  libsepol1 libselinux1 sysvinit initscripts libattr1 libacl1 gcc-4.1-base
-  libgcc1 libstdc++6 sysv-rc dmidecode info sysklogd klogd libssl0.9.8
-  manpages nano libdb4.3 passwd cpp libdb4.2 exim4-config exim4-base
-  exim4-daemon-light exim4 gcc g++ libdb4.4 dhcp3-client dhcp3-common
-(Reading database ... 11040 files and directories currently installed.)
-Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-4_amd64.deb) ...
+  libc6-dev libc6 libslang2 whiptail libnewt0.52 debianutils bash coreutils
+  libdevmapper1.02 e2fslibs e2fsprogs login perl-modules libdb4.4 perl
+  perl-base sed libattr1 libacl1 libblkid1 libcomerr2 libss2 libuuid1 cron
+  dmidecode sysklogd klogd libssl0.9.8 manpages nano libdb4.3 passwd cpp
+  libdb4.2 exim4-daemon-light exim4-config exim4-base exim4 gcc g++
+  dhcp3-client dhcp3-common
+(Reading database ... 11048 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-5_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-4_amd64.deb) ...
+Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-5_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.3.6-4) ...
+Setting up libc6 (2.3.6-5) ...
 Current default timezone: 'UTC'.
-Local time is now:      Mon Apr  3 04:07:18 UTC 2006.
-Universal Time is now:  Mon Apr  3 04:07:18 UTC 2006.
+Local time is now:      Sat Apr  8 03:49:57 UTC 2006.
+Universal Time is now:  Sat Apr  8 03:49:57 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11041 files and directories currently installed.)
+(Reading database ... 11049 files and directories currently installed.)
 Preparing to replace libslang2 2.0.5-3 (using .../libslang2_2.0.6-2_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.6-2) ...
 
-(Reading database ... 11041 files and directories currently installed.)
+(Reading database ... 11049 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-3_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 11040 files and directories currently installed.)
+(Reading database ... 11048 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 10979 files and directories currently installed.)
+(Reading database ... 10987 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-3_amd64.deb) ...
+Preparing to replace debianutils 2.15.3 (using .../debianutils_2.15.4_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.15.4) ...
+
+(Reading database ... 11054 files and directories currently installed.)
 Preparing to replace bash 3.1-2 (using .../archives/bash_3.1-4_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1-4) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 11049 files and directories currently installed.)
+(Reading database ... 11059 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.94-1_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.94-1) ...
 
-(Reading database ... 11069 files and directories currently installed.)
-Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-1_amd64.deb) ...
+Selecting previously deselected package libdevmapper1.02.
+(Reading database ... 11079 files and directories currently installed.)
+Unpacking libdevmapper1.02 (from .../libdevmapper1.02_2%3a1.02.03-1_amd64.deb) ...
+Setting up libdevmapper1.02 (1.02.03-1) ...
+
+(Reading database ... 11085 files and directories currently installed.)
+Preparing to replace e2fslibs 1.38+1.39-WIP-2005.12.31-1 (using .../e2fslibs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement e2fslibs ...
+Setting up e2fslibs (1.38+1.39-WIP-2006.03.29-2.1) ...
+
+(Reading database ... 11085 files and directories currently installed.)
+Preparing to replace e2fsprogs 1.38+1.39-WIP-2005.12.31-1 (using .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement e2fsprogs ...
+Setting up e2fsprogs (1.38+1.39-WIP-2006.03.29-2.1) ...
+(Reading database ... 11088 files and directories currently installed.)
+Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-3_amd64.deb) ...
 Unpacking replacement login ...
-Setting up login (4.0.15-1) ...
+Setting up login (4.0.15-3) ...
 Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 
-(Reading database ... 11074 files and directories currently installed.)
-Preparing to replace libsepol1 1.10-2 (using .../libsepol1_1.12-1_amd64.deb) ...
-Unpacking replacement libsepol1 ...
-Setting up libsepol1 (1.12-1) ...
-
-(Reading database ... 11074 files and directories currently installed.)
-Preparing to replace libselinux1 1.28-4 (using .../libselinux1_1.30-1_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.30-1) ...
-
-(Reading database ... 11074 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-13 (using .../sysvinit_2.86.ds1-14_amd64.deb) ...
-Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-14) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 11074 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-13 (using .../initscripts_2.86.ds1-14_amd64.deb) ...
-Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-14) ...
-Installing new version of config file /etc/init.d/umountfs ...
-
-(Reading database ... 11074 files and directories currently installed.)
+(Reading database ... 11093 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.8-3 (using .../perl-modules_5.8.8-4_all.deb) ...
+Unpacking replacement perl-modules ...
+Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) ...
+Unpacking replacement libdb4.4 ...
+Preparing to replace perl 5.8.8-3 (using .../perl_5.8.8-4_amd64.deb) ...
+Unpacking replacement perl ...
+Preparing to replace perl-base 5.8.8-3 (using .../perl-base_5.8.8-4_amd64.deb) ...
+Unpacking replacement perl-base ...
+Setting up perl-base (5.8.8-4) ...
+(Reading database ... 11093 files and directories currently installed.)
+Preparing to replace sed 4.1.4-5 (using .../archives/sed_4.1.4-7_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.4-7) ...
+
+(Reading database ... 11094 files and directories currently installed.)
 Preparing to replace libattr1 2.4.31-1 (using .../libattr1_2.4.32-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.35-1 (using .../libacl1_2.2.36-1_amd64.deb) ...
@@ -116,108 +129,112 @@ Setting up libattr1 (2.4.32-1) ...
 
 Setting up libacl1 (2.2.36-1) ...
 
-Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 11074 files and directories currently installed.)
-Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
-Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-1_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.0-1) ...
+(Reading database ... 11094 files and directories currently installed.)
+Preparing to replace libblkid1 1.38+1.39-WIP-2005.12.31-1 (using .../libblkid1_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libblkid1 ...
+Setting up libblkid1 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-Setting up libgcc1 (4.1.0-1) ...
+(Reading database ... 11094 files and directories currently installed.)
+Preparing to replace libcomerr2 1.38+1.39-WIP-2005.12.31-1 (using .../libcomerr2_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libcomerr2 ...
+Setting up libcomerr2 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-(Reading database ... 11082 files and directories currently installed.)
-Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-1_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.0-1) ...
+(Reading database ... 11094 files and directories currently installed.)
+Preparing to replace libss2 1.38+1.39-WIP-2005.12.31-1 (using .../libss2_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libss2 ...
+Setting up libss2 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-(Reading database ... 11082 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-13 (using .../sysv-rc_2.86.ds1-14_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-14) ...
+(Reading database ... 11094 files and directories currently installed.)
+Preparing to replace libuuid1 1.38+1.39-WIP-2005.12.31-1 (using .../libuuid1_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libuuid1 ...
+Setting up libuuid1 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-(Reading database ... 11082 files and directories currently installed.)
+(Reading database ... 11094 files and directories currently installed.)
+Preparing to replace cron 3.0pl1-93 (using .../cron_3.0pl1-94_amd64.deb) ...
+Unpacking replacement cron ...
 Preparing to replace dmidecode 2.8-1 (using .../dmidecode_2.8-2_amd64.deb) ...
 Unpacking replacement dmidecode ...
-Preparing to replace info 4.8-6 (using .../archives/info_4.8-8_amd64.deb) ...
-Unpacking replacement info ...
 Preparing to replace sysklogd 1.4.1-17 (using .../sysklogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement sysklogd ...
 Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace libssl0.9.8 0.9.8a-7 (using .../libssl0.9.8_0.9.8a-8_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
-Preparing to replace manpages 2.22-1 (using .../manpages_2.23-1_all.deb) ...
+Preparing to replace manpages 2.22-1 (using .../manpages_2.25-1_all.deb) ...
 Unpacking replacement manpages ...
-Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-1_amd64.deb) ...
+Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-2_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace libdb4.3 4.3.29-4.1 (using .../libdb4.3_4.3.29-5_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
-Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-1_amd64.deb) ...
+Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-3_amd64.deb) ...
 Unpacking replacement passwd ...
-Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-3_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace libdb4.2 4.2.52-23.1 (using .../libdb4.2_4.2.52-24_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
-Preparing to replace exim4-config 4.60-4 (using .../exim4-config_4.60-5_all.deb) ...
+Preparing to replace exim4-daemon-light 4.60-4 (using .../exim4-daemon-light_4.61-1_amd64.deb) ...
+Unpacking replacement exim4-daemon-light ...
+Preparing to replace exim4-config 4.60-4 (using .../exim4-config_4.61-1_all.deb) ...
 Unpacking replacement exim4-config ...
-Preparing to replace exim4-base 4.60-4 (using .../exim4-base_4.60-5+b1_amd64.deb) ...
+Preparing to replace exim4-base 4.60-4 (using .../exim4-base_4.61-1_amd64.deb) ...
 Unpacking replacement exim4-base ...
-Preparing to replace exim4-daemon-light 4.60-4 (using .../exim4-daemon-light_4.60-5+b1_amd64.deb) ...
-Unpacking replacement exim4-daemon-light ...
-Preparing to replace exim4 4.60-4 (using .../archives/exim4_4.60-5_all.deb) ...
+Preparing to replace exim4 4.60-4 (using .../archives/exim4_4.61-1_all.deb) ...
 Unpacking replacement exim4 ...
-Preparing to replace gcc 4:4.0.2-2 (using .../gcc_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace gcc 4:4.0.2-2 (using .../gcc_4%3a4.0.3-3_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
-Preparing to replace g++ 4:4.0.2-2 (using .../g++_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace g++ 4:4.0.2-2 (using .../g++_4%3a4.0.3-3_amd64.deb) ...
 Unpacking replacement g++ ...
-Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) ...
-Unpacking replacement libdb4.4 ...
 Preparing to replace dhcp3-client 3.0.3-6 (using .../dhcp3-client_3.0.3-7_amd64.deb) ...
 Unpacking replacement dhcp3-client ...
 Preparing to replace dhcp3-common 3.0.3-6 (using .../dhcp3-common_3.0.3-7_amd64.deb) ...
 Unpacking replacement dhcp3-common ...
-Setting up libc6-dev (2.3.6-4) ...
+Setting up libc6-dev (2.3.6-5) ...
 Setting up libnewt0.52 (0.52.2-3) ...
 
 Setting up whiptail (0.52.2-3) ...
-Setting up dmidecode (2.8-2) ...
-Setting up info (4.8-8) ...
+Setting up libdb4.4 (4.4.20-4) ...
+Setting up cron (3.0pl1-94) ...
 
+Setting up dmidecode (2.8-2) ...
 Setting up libssl0.9.8 (0.9.8a-8) ...
 
-Setting up manpages (2.23-1) ...
-Setting up nano (1.3.11-1) ...
+Setting up manpages (2.25-1) ...
+Setting up nano (1.3.11-2) ...
+Installing new version of config file /etc/nanorc ...
 
 Setting up libdb4.3 (4.3.29-5) ...
-Setting up passwd (4.0.15-1) ...
+Setting up passwd (4.0.15-3) ...
 
-Setting up cpp (4.0.3-1) ...
+Setting up cpp (4.0.3-3) ...
 
 Setting up libdb4.2 (4.2.52-24) ...
-Setting up exim4-config (4.60-5) ...
+Setting up exim4-config (4.61-1) ...
 Installing new version of config file /etc/exim4/conf.d/acl/20_exim4-config_whitelist_local_deny ...
+Installing new version of config file /etc/exim4/conf.d/main/02_exim4-config_options ...
 Installing new version of config file /etc/exim4/exim4.conf.template ...
 
-Setting up exim4-base (4.60-5+b1) ...
+Setting up exim4-base (4.61-1) ...
 
-Setting up exim4-daemon-light (4.60-5+b1) ...
+Setting up exim4-daemon-light (4.61-1) ...
 
-Setting up exim4 (4.60-5) ...
-Setting up gcc (4.0.3-1) ...
+Setting up exim4 (4.61-1) ...
+Setting up gcc (4.0.3-3) ...
 
-Setting up g++ (4.0.3-1) ...
+Setting up g++ (4.0.3-3) ...
 
-Setting up libdb4.4 (4.4.20-4) ...
 Setting up dhcp3-common (3.0.3-7) ...
 Setting up dhcp3-client (3.0.3-7) ...
 
 Setting up sysklogd (1.4.1-17.1) ...
 
+Setting up perl-modules (5.8.8-4) ...
 Setting up klogd (1.4.1-17.1) ...
 Installing new version of config file /etc/init.d/klogd ...
 Stopping kernel log daemon: klogd.
 
+Setting up perl (5.8.8-4) ...
+
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -231,9 +248,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//24044/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//21255/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24044 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//21255 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 3fc57b1..691870a 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//15602/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//12248/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,9 +18,9 @@ Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Ign http://ftp.jp.debian.org experimental Release
 Get:4 http://ftp.jp.debian.org sid Release [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [158kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [162kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 169kB in 0s (462kB/s)
+Fetched 172kB in 0s (371kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -38,15 +38,15 @@ Need to get 0B/2979kB of archives.
 After unpacking 315kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   diff lsb-base aptitude gettext-base
-(Reading database ... 12349 files and directories currently installed.)
+(Reading database ... 12365 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 ... 12357 files and directories currently installed.)
+(Reading database ... 12373 files and directories currently installed.)
 Preparing to replace lsb-base 3.0-16 (using .../lsb-base_3.1-1_all.deb) ...
 Unpacking replacement lsb-base ...
 Setting up lsb-base (3.1-1) ...
-(Reading database ... 12357 files and directories currently installed.)
+(Reading database ... 12373 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace gettext-base 0.14.5-2 (using .../gettext-base_0.14.5-2.csharp.1_amd64.deb) ...
@@ -74,10 +74,10 @@ Need to get 0B/1535kB of archives.
 After unpacking 9683kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
   apt-utils apt
-(Reading database ... 12357 files and directories currently installed.)
+(Reading database ... 12373 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 12152 files and directories currently installed.)
+(Reading database ... 12168 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.3 (using .../apt-utils_0.6.43.3exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.3 (using .../apt_0.6.43.3exp1_amd64.deb) ...
@@ -93,9 +93,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//15602/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//12248/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//15602 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12248 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
index efea5c6..dede8ce 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//13617/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//10159/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -13,8 +13,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [4028kB]
-Fetched 4034kB in 2s (1888kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [4043kB]
+Fetched 4049kB in 2s (1820kB/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,90 +25,103 @@ Building dependency tree...
 The following packages will be REMOVED:
   libnewt0.51
 The following NEW packages will be installed:
-  gcc-4.1-base libnewt0.52
+  libdevmapper1.02 libnewt0.52
 The following packages will be upgraded:
-  base-config bash console-data coreutils cpp dhcp3-client dhcp3-common
-  dmidecode exim4 exim4-base exim4-config exim4-daemon-light g++ gcc info
-  initscripts klogd libacl1 libattr1 libc6 libc6-dev libdb4.2 libdb4.3
-  libdb4.4 libgcc1 libselinux1 libsepol1 libslang2 libssl0.9.8 libstdc++6
-  login manpages nano passwd sysklogd sysv-rc sysvinit whiptail
-38 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/20.9MB of archives.
-After unpacking 1606kB of additional disk space will be used.
+  base-config bash console-data coreutils cpp cron debianutils dhcp3-client
+  dhcp3-common dmidecode e2fslibs e2fsprogs exim4 exim4-base exim4-config
+  exim4-daemon-light g++ gcc klogd libacl1 libattr1 libblkid1 libc6 libc6-dev
+  libcomerr2 libdb4.2 libdb4.3 libdb4.4 libslang2 libss2 libssl0.9.7
+  libssl0.9.8 libuuid1 login manpages nano passwd perl perl-base perl-modules
+  sed sysklogd whiptail
+43 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0B/29.1MB of archives.
+After unpacking 1765kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  libc6-dev libc6 libslang2 whiptail libnewt0.52 bash coreutils login
-  libsepol1 libselinux1 sysvinit initscripts libattr1 libacl1 gcc-4.1-base
-  libgcc1 libstdc++6 sysv-rc dmidecode info sysklogd klogd libssl0.9.8
-  manpages nano libdb4.3 passwd cpp libdb4.2 exim4-config exim4-base
-  exim4-daemon-light exim4 gcc g++ libdb4.4 console-data dhcp3-client
-  dhcp3-common base-config
-(Reading database ... 12413 files and directories currently installed.)
-Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-4_amd64.deb) ...
+  libc6-dev libc6 libslang2 whiptail libnewt0.52 debianutils bash coreutils
+  libdevmapper1.02 e2fslibs e2fsprogs login perl-modules libdb4.4 perl
+  perl-base sed libattr1 libacl1 libblkid1 libcomerr2 libss2 libuuid1 cron
+  dmidecode sysklogd klogd libssl0.9.8 manpages nano libdb4.3 passwd cpp
+  libdb4.2 exim4-daemon-light exim4-config exim4-base exim4 gcc g++
+  console-data dhcp3-client dhcp3-common base-config libssl0.9.7
+(Reading database ... 12421 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-5_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-4_amd64.deb) ...
+Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-5_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.3.6-4) ...
+Setting up libc6 (2.3.6-5) ...
 Current default timezone: 'UTC'.
-Local time is now:      Mon Apr  3 03:59:22 UTC 2006.
-Universal Time is now:  Mon Apr  3 03:59:22 UTC 2006.
+Local time is now:      Sat Apr  8 03:39:33 UTC 2006.
+Universal Time is now:  Sat Apr  8 03:39:33 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 12414 files and directories currently installed.)
+(Reading database ... 12422 files and directories currently installed.)
 Preparing to replace libslang2 2.0.5-3 (using .../libslang2_2.0.6-2_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.6-2) ...
 
-(Reading database ... 12414 files and directories currently installed.)
+(Reading database ... 12422 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-3_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 12413 files and directories currently installed.)
+(Reading database ... 12421 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 12352 files and directories currently installed.)
+(Reading database ... 12360 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-3_amd64.deb) ...
+Preparing to replace debianutils 2.15.3 (using .../debianutils_2.15.4_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.15.4) ...
+
+(Reading database ... 12427 files and directories currently installed.)
 Preparing to replace bash 3.1-2 (using .../archives/bash_3.1-4_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1-4) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 12422 files and directories currently installed.)
+(Reading database ... 12432 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.94-1_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.94-1) ...
 
-(Reading database ... 12442 files and directories currently installed.)
-Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-1_amd64.deb) ...
+Selecting previously deselected package libdevmapper1.02.
+(Reading database ... 12452 files and directories currently installed.)
+Unpacking libdevmapper1.02 (from .../libdevmapper1.02_2%3a1.02.03-1_amd64.deb) ...
+Setting up libdevmapper1.02 (1.02.03-1) ...
+
+(Reading database ... 12458 files and directories currently installed.)
+Preparing to replace e2fslibs 1.38+1.39-WIP-2005.12.31-1 (using .../e2fslibs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement e2fslibs ...
+Setting up e2fslibs (1.38+1.39-WIP-2006.03.29-2.1) ...
+
+(Reading database ... 12458 files and directories currently installed.)
+Preparing to replace e2fsprogs 1.38+1.39-WIP-2005.12.31-1 (using .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement e2fsprogs ...
+Setting up e2fsprogs (1.38+1.39-WIP-2006.03.29-2.1) ...
+(Reading database ... 12461 files and directories currently installed.)
+Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-3_amd64.deb) ...
 Unpacking replacement login ...
-Setting up login (4.0.15-1) ...
+Setting up login (4.0.15-3) ...
 Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 
-(Reading database ... 12447 files and directories currently installed.)
-Preparing to replace libsepol1 1.10-2 (using .../libsepol1_1.12-1_amd64.deb) ...
-Unpacking replacement libsepol1 ...
-Setting up libsepol1 (1.12-1) ...
-
-(Reading database ... 12447 files and directories currently installed.)
-Preparing to replace libselinux1 1.28-4 (using .../libselinux1_1.30-1_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.30-1) ...
-
-(Reading database ... 12447 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-13 (using .../sysvinit_2.86.ds1-14_amd64.deb) ...
-Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-14) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 12447 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-13 (using .../initscripts_2.86.ds1-14_amd64.deb) ...
-Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-14) ...
-Installing new version of config file /etc/init.d/umountfs ...
-
-(Reading database ... 12447 files and directories currently installed.)
+(Reading database ... 12466 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.8-3 (using .../perl-modules_5.8.8-4_all.deb) ...
+Unpacking replacement perl-modules ...
+Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) ...
+Unpacking replacement libdb4.4 ...
+Preparing to replace perl 5.8.8-3 (using .../perl_5.8.8-4_amd64.deb) ...
+Unpacking replacement perl ...
+Preparing to replace perl-base 5.8.8-3 (using .../perl-base_5.8.8-4_amd64.deb) ...
+Unpacking replacement perl-base ...
+Setting up perl-base (5.8.8-4) ...
+(Reading database ... 12466 files and directories currently installed.)
+Preparing to replace sed 4.1.4-5 (using .../archives/sed_4.1.4-7_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.4-7) ...
+
+(Reading database ... 12467 files and directories currently installed.)
 Preparing to replace libattr1 2.4.31-1 (using .../libattr1_2.4.32-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.35-1 (using .../libacl1_2.2.36-1_amd64.deb) ...
@@ -117,63 +130,62 @@ Setting up libattr1 (2.4.32-1) ...
 
 Setting up libacl1 (2.2.36-1) ...
 
-Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 12447 files and directories currently installed.)
-Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
-Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-1_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.0-1) ...
+(Reading database ... 12467 files and directories currently installed.)
+Preparing to replace libblkid1 1.38+1.39-WIP-2005.12.31-1 (using .../libblkid1_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libblkid1 ...
+Setting up libblkid1 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-Setting up libgcc1 (4.1.0-1) ...
+(Reading database ... 12467 files and directories currently installed.)
+Preparing to replace libcomerr2 1.38+1.39-WIP-2005.12.31-1 (using .../libcomerr2_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libcomerr2 ...
+Setting up libcomerr2 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-(Reading database ... 12455 files and directories currently installed.)
-Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-1_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.0-1) ...
+(Reading database ... 12467 files and directories currently installed.)
+Preparing to replace libss2 1.38+1.39-WIP-2005.12.31-1 (using .../libss2_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libss2 ...
+Setting up libss2 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-(Reading database ... 12455 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-13 (using .../sysv-rc_2.86.ds1-14_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-14) ...
+(Reading database ... 12467 files and directories currently installed.)
+Preparing to replace libuuid1 1.38+1.39-WIP-2005.12.31-1 (using .../libuuid1_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libuuid1 ...
+Setting up libuuid1 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-(Reading database ... 12455 files and directories currently installed.)
+(Reading database ... 12467 files and directories currently installed.)
+Preparing to replace cron 3.0pl1-93 (using .../cron_3.0pl1-94_amd64.deb) ...
+Unpacking replacement cron ...
 Preparing to replace dmidecode 2.8-1 (using .../dmidecode_2.8-2_amd64.deb) ...
 Unpacking replacement dmidecode ...
-Preparing to replace info 4.8-6 (using .../archives/info_4.8-8_amd64.deb) ...
-Unpacking replacement info ...
 Preparing to replace sysklogd 1.4.1-17 (using .../sysklogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement sysklogd ...
 Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace libssl0.9.8 0.9.8a-7 (using .../libssl0.9.8_0.9.8a-8_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
-Preparing to replace manpages 2.22-1 (using .../manpages_2.23-1_all.deb) ...
+Preparing to replace manpages 2.22-1 (using .../manpages_2.25-1_all.deb) ...
 Unpacking replacement manpages ...
-Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-1_amd64.deb) ...
+Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-2_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace libdb4.3 4.3.29-4.1 (using .../libdb4.3_4.3.29-5_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
-Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-1_amd64.deb) ...
+Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-3_amd64.deb) ...
 Unpacking replacement passwd ...
-Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-3_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace libdb4.2 4.2.52-23.1 (using .../libdb4.2_4.2.52-24_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
-Preparing to replace exim4-config 4.60-4 (using .../exim4-config_4.60-5_all.deb) ...
+Preparing to replace exim4-daemon-light 4.60-4 (using .../exim4-daemon-light_4.61-1_amd64.deb) ...
+Unpacking replacement exim4-daemon-light ...
+Preparing to replace exim4-config 4.60-4 (using .../exim4-config_4.61-1_all.deb) ...
 Unpacking replacement exim4-config ...
-Preparing to replace exim4-base 4.60-4 (using .../exim4-base_4.60-5+b1_amd64.deb) ...
+Preparing to replace exim4-base 4.60-4 (using .../exim4-base_4.61-1_amd64.deb) ...
 Unpacking replacement exim4-base ...
-Preparing to replace exim4-daemon-light 4.60-4 (using .../exim4-daemon-light_4.60-5+b1_amd64.deb) ...
-Unpacking replacement exim4-daemon-light ...
-Preparing to replace exim4 4.60-4 (using .../archives/exim4_4.60-5_all.deb) ...
+Preparing to replace exim4 4.60-4 (using .../archives/exim4_4.61-1_all.deb) ...
 Unpacking replacement exim4 ...
-Preparing to replace gcc 4:4.0.2-2 (using .../gcc_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace gcc 4:4.0.2-2 (using .../gcc_4%3a4.0.3-3_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
-Preparing to replace g++ 4:4.0.2-2 (using .../g++_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace g++ 4:4.0.2-2 (using .../g++_4%3a4.0.3-3_amd64.deb) ...
 Unpacking replacement g++ ...
-Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) ...
-Unpacking replacement libdb4.4 ...
 Preparing to replace console-data 2002.12.04dbs-52.2 (using .../console-data_20060317_all.deb) ...
 Unpacking replacement console-data ...
 Preparing to replace dhcp3-client 3.0.3-6 (using .../dhcp3-client_3.0.3-7_amd64.deb) ...
@@ -182,38 +194,42 @@ Preparing to replace dhcp3-common 3.0.3-6 (using .../dhcp3-common_3.0.3-7_amd64.
 Unpacking replacement dhcp3-common ...
 Preparing to replace base-config 2.53.10-0.0.0.1.pure64 (using .../base-config_2.76_all.deb) ...
 Unpacking replacement base-config ...
-Setting up libc6-dev (2.3.6-4) ...
+Preparing to replace libssl0.9.7 0.9.7g-5 (using .../libssl0.9.7_0.9.7i-1_amd64.deb) ...
+Unpacking replacement libssl0.9.7 ...
+Setting up libc6-dev (2.3.6-5) ...
 Setting up libnewt0.52 (0.52.2-3) ...
 
 Setting up whiptail (0.52.2-3) ...
-Setting up dmidecode (2.8-2) ...
-Setting up info (4.8-8) ...
+Setting up libdb4.4 (4.4.20-4) ...
+Setting up cron (3.0pl1-94) ...
 
+Setting up dmidecode (2.8-2) ...
 Setting up libssl0.9.8 (0.9.8a-8) ...
 
-Setting up manpages (2.23-1) ...
-Setting up nano (1.3.11-1) ...
+Setting up manpages (2.25-1) ...
+Setting up nano (1.3.11-2) ...
+Installing new version of config file /etc/nanorc ...
 
 Setting up libdb4.3 (4.3.29-5) ...
-Setting up passwd (4.0.15-1) ...
+Setting up passwd (4.0.15-3) ...
 
-Setting up cpp (4.0.3-1) ...
+Setting up cpp (4.0.3-3) ...
 
 Setting up libdb4.2 (4.2.52-24) ...
-Setting up exim4-config (4.60-5) ...
+Setting up exim4-config (4.61-1) ...
 Installing new version of config file /etc/exim4/conf.d/acl/20_exim4-config_whitelist_local_deny ...
+Installing new version of config file /etc/exim4/conf.d/main/02_exim4-config_options ...
 Installing new version of config file /etc/exim4/exim4.conf.template ...
 
-Setting up exim4-base (4.60-5+b1) ...
+Setting up exim4-base (4.61-1) ...
 
-Setting up exim4-daemon-light (4.60-5+b1) ...
+Setting up exim4-daemon-light (4.61-1) ...
 
-Setting up exim4 (4.60-5) ...
-Setting up gcc (4.0.3-1) ...
+Setting up exim4 (4.61-1) ...
+Setting up gcc (4.0.3-3) ...
 
-Setting up g++ (4.0.3-1) ...
+Setting up g++ (4.0.3-3) ...
 
-Setting up libdb4.4 (4.4.20-4) ...
 Setting up console-data (20060317) ...
 Looking for keymap to install:
 NONE
@@ -223,12 +239,17 @@ Setting up dhcp3-client (3.0.3-7) ...
 
 Setting up base-config (2.76) ...
 
+Setting up libssl0.9.7 (0.9.7i-1) ...
+
 Setting up sysklogd (1.4.1-17.1) ...
 
+Setting up perl-modules (5.8.8-4) ...
 Setting up klogd (1.4.1-17.1) ...
 Installing new version of config file /etc/init.d/klogd ...
 Stopping kernel log daemon: klogd.
 
+Setting up perl (5.8.8-4) ...
+
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -242,9 +263,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//13617/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//10159/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//13617 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//10159 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
index 37d4662..1442efe 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
@@ -1,27 +1,28 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//8087/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//4544/etc/mtab' to `../proc/mounts': 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 [3730kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3738kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3730kB in 2s (1851kB/s)
+Fetched 3738kB in 2s (1429kB/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 NEW packages will be installed:
-  cpp-4.0 dmidecode g++-4.0 gcc-4.0 gcc-4.0-base laptop-detect libdb4.3
-  libdb4.4 libgnutls12 libncursesw5 libselinux1 libsepol1 libsigc++-2.0-0c2a
-  libslang2 libssl0.9.8 libstdc++6 libstdc++6-4.0-dev lsb-base
+  cpp-4.0 dmidecode g++-4.0 gcc-4.0 gcc-4.0-base gcc-4.1-base laptop-detect
+  libdb4.3 libdb4.4 libgnutls12 libncursesw5 libselinux1 libsepol1
+  libsigc++-2.0-0c2a libslang2 libssl0.9.8 libstdc++6 libstdc++6-4.0-dev
+  lsb-base
 The following packages will be upgraded:
   adduser apt apt-utils aptitude at base-files base-passwd bash binutils
   bsdmainutils bsdutils build-essential console-common console-data
@@ -39,9 +40,9 @@ The following packages will be upgraded:
   module-init-tools modutils mount nano ncurses-base ncurses-bin net-tools
   netbase netkit-inetd passwd patch perl perl-base perl-modules procps psmisc
   sed sysv-rc sysvinit tar tasksel tcpd telnet util-linux wget whiptail zlib1g
-116 upgraded, 18 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/64.2MB of archives.
-After unpacking 39.6MB of additional disk space will be used.
+116 upgraded, 19 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/64.5MB of archives.
+After unpacking 39.9MB of additional disk space will be used.
 (Reading database ... 10733 files and directories currently installed.)
 Preparing to replace linux-kernel-headers 2.5.999-test7-bk-17 (using .../linux-kernel-headers_2.6.13+0rc3-2.1_amd64.deb) ...
 Unpacking replacement linux-kernel-headers ...
@@ -74,8 +75,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-3) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Mon Apr  3 03:57:43 UTC 2006.
-Universal Time is now:  Mon Apr  3 03:57:43 UTC 2006.
+Local time is now:      Sat Apr  8 03:37:50 UTC 2006.
+Universal Time is now:  Sat Apr  8 03:37:50 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11045 files and directories currently installed.)
@@ -171,13 +172,13 @@ Selecting previously deselected package libdb4.3.
 (Reading database ... 11064 files and directories currently installed.)
 Unpacking libdb4.3 (from .../libdb4.3_4.3.29-4.1_amd64.deb) ...
 Selecting previously deselected package libsepol1.
-Unpacking libsepol1 (from .../libsepol1_1.10-2_amd64.deb) ...
-Setting up libsepol1 (1.10-2) ...
+Unpacking libsepol1 (from .../libsepol1_1.12-1_amd64.deb) ...
+Setting up libsepol1 (1.12-1) ...
 
 Selecting previously deselected package libselinux1.
 (Reading database ... 11073 files and directories currently installed.)
-Unpacking libselinux1 (from .../libselinux1_1.28-4_amd64.deb) ...
-Setting up libselinux1 (1.28-4) ...
+Unpacking libselinux1 (from .../libselinux1_1.30-1_amd64.deb) ...
+Setting up libselinux1 (1.30-1) ...
 
 (Reading database ... 11078 files and directories currently installed.)
 Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3.1_all.deb) ...
@@ -232,14 +233,14 @@ Unpacking replacement sed ...
 Setting up sed (4.1.4-5) ...
 
 (Reading database ... 11648 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-13_all.deb) ...
+Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-14_all.deb) ...
 Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-13) ...
+Setting up sysv-rc (2.86.ds1-14) ...
 
 (Reading database ... 11658 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-13_amd64.deb) ...
+Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-14_amd64.deb) ...
 Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-13) ...
+Setting up sysvinit (2.86.ds1-14) ...
 init: timeout opening/writing control channel /dev/initctl
 
 (Reading database ... 11660 files and directories currently installed.)
@@ -330,18 +331,18 @@ Setting up debconf (1.4.72) ...
 (Reading database ... 11717 files and directories currently installed.)
 Preparing to replace console-common 0.7.49 (using .../console-common_0.7.55.1_all.deb) ...
 Unpacking replacement console-common ...
-Selecting previously deselected package gcc-4.0-base.
-Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
-Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.0.3-1_amd64.deb) ...
+Selecting previously deselected package gcc-4.1-base.
+Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
+Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.1.0-1_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.0-base (4.0.3-1) ...
+Setting up gcc-4.1-base (4.1.0-1) ...
 
-Setting up libgcc1 (4.0.3-1) ...
+Setting up libgcc1 (4.1.0-1) ...
 
 Selecting previously deselected package libstdc++6.
 (Reading database ... 11730 files and directories currently installed.)
-Unpacking libstdc++6 (from .../libstdc++6_4.0.3-1_amd64.deb) ...
-Setting up libstdc++6 (4.0.3-1) ...
+Unpacking libstdc++6 (from .../libstdc++6_4.1.0-1_amd64.deb) ...
+Setting up libstdc++6 (4.1.0-1) ...
 
 (Reading database ... 11733 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.43.3_amd64.deb) ...
@@ -362,10 +363,10 @@ Unpacking replacement dselect ...
 Setting up dselect (1.13.17) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
 (Reading database ... 11789 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-13_amd64.deb) ...
+Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-14_amd64.deb) ...
 Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
 Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-13) ...
+Setting up initscripts (2.86.ds1-14) ...
 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 ...
@@ -490,7 +491,7 @@ Preparing to replace gettext-base 0.14.4-2 (using .../gettext-base_0.14.5-2_amd6
 Unpacking replacement gettext-base ...
 Preparing to replace groff-base 1.18.1.1-7 (using .../groff-base_1.18.1.1-11_amd64.deb) ...
 Unpacking replacement groff-base ...
-Preparing to replace info 4.7-2.2 (using .../archives/info_4.8-6_amd64.deb) ...
+Preparing to replace info 4.7-2.2 (using .../archives/info_4.8-8_amd64.deb) ...
 Unpacking replacement info ...
 Preparing to replace iptables 1.2.11-10 (using .../iptables_1.3.3-2_amd64.deb) ...
 Unpacking replacement iptables ...
@@ -522,6 +523,8 @@ Preparing to replace whiptail 0.51.6-20 (using .../whiptail_0.51.6-31_amd64.deb)
 Unpacking replacement whiptail ...
 Preparing to replace libnewt0.51 0.51.6-20 (using .../libnewt0.51_0.51.6-31_amd64.deb) ...
 Unpacking replacement libnewt0.51 ...
+Selecting previously deselected package gcc-4.0-base.
+Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
 Preparing to replace makedev 2.3.1-77 (using .../makedev_2.3.1-80_all.deb) ...
 Unpacking replacement makedev ...
 Preparing to replace procps 1:3.2.1-2 (using .../procps_1%3a3.2.6-2.1_amd64.deb) ...
@@ -658,7 +661,7 @@ Setting up gettext-base (0.14.5-2) ...
 
 Setting up groff-base (1.18.1.1-11) ...
 
-Setting up info (4.8-6) ...
+Setting up info (4.8-8) ...
 
 Setting up iptables (1.3.3-2) ...
 
@@ -694,6 +697,8 @@ Installing new version of config file /etc/wgetrc ...
 Setting up libnewt0.51 (0.51.6-31) ...
 
 Setting up whiptail (0.51.6-31) ...
+Setting up gcc-4.0-base (4.0.3-1) ...
+
 Setting up makedev (2.3.1-80) ...
 Installing new version of config file /etc/init.d/makedev ...
 
@@ -763,9 +768,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//8087/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//4544/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//8087 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//4544 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index 8117282..98efc48 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/16807/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/13873/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -26,7 +26,7 @@ After unpacking 758kB 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 ... 11040 files and directories currently installed.)
+(Reading database ... 11048 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.38_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.38_amd64.deb) ...
@@ -64,7 +64,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11137 files and directories currently installed.)
+(Reading database ... 11145 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
@@ -110,7 +110,7 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11791 files and directories currently installed.)
+(Reading database ... 11799 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
@@ -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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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
@@ -374,6 +374,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
@@ -408,11 +409,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
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Mon Apr  3 04:06:14 UTC 2006
+Sat Apr  8 03:48:26 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,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
-Mon Apr  3 04:06:19 UTC 2006
+Sat Apr  8 03:48:31 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -498,9 +499,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -510,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.c0ynuA/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.e6fnxW/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -600,6 +601,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.c0ynuA/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/16807 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/13873 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sarge.log b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
index 225e742..0859242 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/819/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/29539/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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
@@ -385,8 +385,8 @@ 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
+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
@@ -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
-Mon Apr  3 03:56:38 UTC 2006
+Sat Apr  8 03:36:28 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -469,7 +469,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
-Mon Apr  3 03:56:43 UTC 2006
+Sat Apr  8 03:36:33 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.e6fnxW/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/819 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/29539 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index 1358756..b08c2d3 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26739/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/23618/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -26,7 +26,7 @@ After unpacking 766kB 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 ... 11096 files and directories currently installed.)
+(Reading database ... 11106 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.41_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.41_amd64.deb) ...
@@ -64,7 +64,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11193 files and directories currently installed.)
+(Reading database ... 11203 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
@@ -110,7 +110,7 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11847 files and directories currently installed.)
+(Reading database ... 11857 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
@@ -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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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
@@ -409,11 +409,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
-Mon Apr  3 03:50:58 UTC 2006
+Sat Apr  8 03:29:51 UTC 2006
 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
-Mon Apr  3 03:51:03 UTC 2006
+Sat Apr  8 03:29:56 UTC 2006
 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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.e6fnxW/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -601,6 +601,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.c0ynuA/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26739 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/23618 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index 5b7abaf..827e12a 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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 13:04:20 JST 2006
-pbuilder-time-stamp: 1144037060
+Current time: Sat Apr  8 12:45:50 JST 2006
+pbuilder-time-stamp: 1144467950
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9940/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/6948/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -69,7 +69,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11040 files and directories currently installed.)
+(Reading database ... 11048 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
@@ -115,13 +115,13 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11694 files and directories currently installed.)
+(Reading database ... 11702 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9940/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9940/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/6948/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/6948/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -412,6 +412,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
@@ -446,11 +447,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
-Mon Apr  3 04:05:11 UTC 2006
+Sat Apr  8 03:47:00 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -520,13 +521,13 @@ 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
-Mon Apr  3 04:05:16 UTC 2006
+Sat Apr  8 03:47:05 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -650,7 +651,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: Mon Apr  3 13:05:19 JST 2006
-pbuilder-time-stamp: 1144037119
+Current time: Sat Apr  8 12:47:08 JST 2006
+pbuilder-time-stamp: 1144468028
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9940 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/6948 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sarge.log b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
index 962c187..5aae64b 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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 12:55:03 JST 2006
-pbuilder-time-stamp: 1144036503
+Current time: Sat Apr  8 12:34:17 JST 2006
+pbuilder-time-stamp: 1144467257
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26489/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/22636/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -115,8 +115,8 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26489/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26489/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/22636/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/22636/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -441,7 +441,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
-Mon Apr  3 03:55:48 UTC 2006
+Sat Apr  8 03:35:18 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -511,14 +511,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
-Mon Apr  3 03:55:53 UTC 2006
+Sat Apr  8 03:35:23 UTC 2006
 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
@@ -624,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: Mon Apr  3 12:55:55 JST 2006
-pbuilder-time-stamp: 1144036555
+Current time: Sat Apr  8 12:35:25 JST 2006
+pbuilder-time-stamp: 1144467325
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26489 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/22636 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index 1278146..f80dd5c 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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 12:48:36 JST 2006
-pbuilder-time-stamp: 1144036116
+Current time: Sat Apr  8 12:27:35 JST 2006
+pbuilder-time-stamp: 1144466855
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/19562/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/16710/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -69,7 +69,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11096 files and directories currently installed.)
+(Reading database ... 11106 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
@@ -115,13 +115,13 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11750 files and directories currently installed.)
+(Reading database ... 11760 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/19562/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/19562/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/16710/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/16710/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -412,6 +412,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
@@ -446,11 +447,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
-Mon Apr  3 03:49:41 UTC 2006
+Sat Apr  8 03:28:39 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -520,7 +521,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
-Mon Apr  3 03:49:46 UTC 2006
+Sat Apr  8 03:28:44 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -650,7 +651,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: Mon Apr  3 12:49:49 JST 2006
-pbuilder-time-stamp: 1144036189
+Current time: Sat Apr  8 12:28:47 JST 2006
+pbuilder-time-stamp: 1144466927
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/19562 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/16710 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index e24d937..0e2e6b4 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 12:35:05 JST 2006
-pbuilder-time-stamp: 1144035305
+Current time: Sat Apr  8 12:18:11 JST 2006
+pbuilder-time-stamp: 1144466291
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2282/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/31173/etc/mtab' to `../proc/mounts': 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/2910kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11215 files and directories currently installed.)
+(Reading database ... 11223 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -76,17 +76,17 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11809 files and directories currently installed.)
+(Reading database ... 11817 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2282/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2282/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/31173/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/31173/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -411,7 +411,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
-Mon Apr  3 03:35:48 UTC 2006
+Sat Apr  8 03:19:01 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -424,32 +424,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
-1: Setting forklimit to 3 and wait_shell to 0
-1: ... Waiting for process to end with waitpid
-1: DUMPing parameters passed to llexec
-1: [1] 
-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
-... Waiting for process to end with waitpid
-DUMPing parameters passed to llexec
-[1] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -481,13 +455,13 @@ 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
-Mon Apr  3 03:35:53 UTC 2006
+Sat Apr  8 03:19:06 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -611,7 +585,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: Mon Apr  3 12:35:55 JST 2006
-pbuilder-time-stamp: 1144035355
+Current time: Sat Apr  8 12:19:13 JST 2006
+pbuilder-time-stamp: 1144466353
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2282 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/31173 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sarge.log b/testsuite/normal/pbuilder-build-dsh-sarge.log
index 5e15f51..6781040 100644
--- a/testsuite/normal/pbuilder-build-dsh-sarge.log
+++ b/testsuite/normal/pbuilder-build-dsh-sarge.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 12:22:11 JST 2006
-pbuilder-time-stamp: 1144034531
+Current time: Sat Apr  8 12:08:46 JST 2006
+pbuilder-time-stamp: 1144465726
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28331/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/23936/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -86,12 +86,12 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28331/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28331/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/23936/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/23936/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -409,7 +409,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
-Mon Apr  3 03:22:46 UTC 2006
+Sat Apr  8 03:09:36 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -479,14 +479,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
-Mon Apr  3 03:22:51 UTC 2006
+Sat Apr  8 03:09:41 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
-dsh: Process terminated (before write).
 b: b
 c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -592,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: Mon Apr  3 12:22:54 JST 2006
-pbuilder-time-stamp: 1144034574
+Current time: Sat Apr  8 12:09:43 JST 2006
+pbuilder-time-stamp: 1144465783
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28331 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/23936 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 63185d9..9644471 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 12:02:24 JST 2006
-pbuilder-time-stamp: 1144033344
+Current time: Sat Apr  8 12:02:40 JST 2006
+pbuilder-time-stamp: 1144465360
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28930/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/24112/etc/mtab' to `../proc/mounts': 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/2911kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11271 files and directories currently installed.)
+(Reading database ... 11285 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -76,17 +76,17 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11865 files and directories currently installed.)
+(Reading database ... 11879 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28930/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28930/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/24112/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/24112/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -412,7 +412,7 @@ PASS: tests/param-r-invalid.sh
 1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Mon Apr  3 03:03:25 UTC 2006
+Sat Apr  8 03:03:47 UTC 2006
 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
-Mon Apr  3 03:03:30 UTC 2006
+Sat Apr  8 03:03:52 UTC 2006
 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
-b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -612,7 +612,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: Mon Apr  3 12:03:32 JST 2006
-pbuilder-time-stamp: 1144033412
+Current time: Sat Apr  8 12:03:56 JST 2006
+pbuilder-time-stamp: 1144465436
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28930 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir1/24112 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 959707a..eeeb4e6 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -59,6 +59,8 @@ I: Retrieving findutils
 I: Validating findutils
 I: Retrieving gcc-4.0-base
 I: Validating gcc-4.0-base
+I: Retrieving gcc-4.1-base
+I: Validating gcc-4.1-base
 I: Retrieving gettext-base
 I: Validating gettext-base
 I: Retrieving gnupg
@@ -262,6 +264,7 @@ I: Extracting e2fslibs...
 I: Extracting e2fsprogs...
 I: Extracting findutils...
 I: Extracting gcc-4.0-base...
+I: Extracting gcc-4.1-base...
 I: Extracting grep...
 I: Extracting gzip...
 I: Extracting hostname...
@@ -321,6 +324,7 @@ I: Unpacking e2fslibs...
 I: Unpacking e2fsprogs...
 I: Unpacking findutils...
 I: Unpacking gcc-4.0-base...
+I: Unpacking gcc-4.1-base...
 I: Unpacking grep...
 I: Unpacking gzip...
 I: Unpacking hostname...
@@ -366,6 +370,7 @@ I: Unpacking zlib1g...
 I: Configuring required packages...
 I: Configuring sysv-rc...
 I: Configuring gcc-4.0-base...
+I: Configuring gcc-4.1-base...
 I: Configuring libpam-runtime...
 I: Configuring libc6...
 I: Configuring libcap1...
@@ -559,17 +564,17 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//25069/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//21390/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//25069/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//21390/etc/mtab' to `../proc/mounts': 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 1s (99B/s)
+Fetched 189B in 0s (2425B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -597,7 +602,7 @@ The following NEW packages will be installed:
 Need to get 0B/20.9MB of archives.
 After unpacking 83.0MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 6851 files and directories currently installed.)
+(Reading database ... 6859 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.3-1_amd64.deb) ...
@@ -661,9 +666,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//25069/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//21390/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25069 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//21390 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sarge.log b/testsuite/normal/pbuilder-create-sarge.log
index 34f8773..b99c34a 100644
--- a/testsuite/normal/pbuilder-create-sarge.log
+++ b/testsuite/normal/pbuilder-create-sarge.log
@@ -330,16 +330,16 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//17610/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//13163/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//17610/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//13163/etc/mtab' to `../proc/mounts': 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 (1933B/s)
+Fetched 110B in 0s (2613B/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -426,9 +426,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] [pid | job]... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//17610/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//13163/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//17610 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13163 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 7bffb78..a946680 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -401,10 +401,8 @@ I: Configuring grep...
 I: Configuring hostname...
 I: Configuring libacl1...
 I: Configuring libslang2...
-I: Configuring libblkid1...
 I: Configuring libss2...
 I: Configuring findutils...
-I: Configuring e2fsprogs...
 I: Configuring liblocale-gettext-perl...
 I: Configuring diff...
 I: Configuring libselinux1...
@@ -420,14 +418,16 @@ I: Configuring ncurses-base...
 I: Configuring ncurses-bin...
 I: Configuring libpam-modules...
 I: Configuring base-files...
-I: Configuring mount...
 I: Configuring libnewt0.52...
+I: Configuring libblkid1...
+I: Configuring e2fsprogs...
 I: Configuring gzip...
 I: Configuring dpkg...
 I: Configuring dselect...
 I: Configuring bash...
 I: Configuring login...
 I: Configuring lsb-base...
+I: Configuring mount...
 I: Configuring passwd...
 I: Configuring initscripts...
 I: Configuring util-linux...
@@ -570,17 +570,17 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//19135/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//14202/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//19135/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//14202/etc/mtab' to `../proc/mounts': 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 (1184B/s)
+Fetched 189B in 0s (3075B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -608,18 +608,18 @@ The following NEW packages will be installed:
 Need to get 0B/20.9MB of archives.
 After unpacking 83.0MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 6907 files and directories currently installed.)
+(Reading database ... 6921 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package cpp.
-Unpacking cpp (from .../cpp_4%3a4.0.3-1_amd64.deb) ...
+Unpacking cpp (from .../cpp_4%3a4.0.3-3_amd64.deb) ...
 Selecting previously deselected package perl-modules.
-Unpacking perl-modules (from .../perl-modules_5.8.8-3_all.deb) ...
+Unpacking perl-modules (from .../perl-modules_5.8.8-4_all.deb) ...
 Selecting previously deselected package libdb4.4.
 Unpacking libdb4.4 (from .../libdb4.4_4.4.20-4_amd64.deb) ...
 Selecting previously deselected package perl.
-Unpacking perl (from .../perl_5.8.8-3_amd64.deb) ...
+Unpacking perl (from .../perl_5.8.8-4_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package make.
@@ -629,58 +629,53 @@ Unpacking dpkg-dev (from .../dpkg-dev_1.13.17_all.deb) ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package gcc.
-Unpacking gcc (from .../gcc_4%3a4.0.3-1_amd64.deb) ...
+Unpacking gcc (from .../gcc_4%3a4.0.3-3_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
 Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-2.1_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.3.6-4_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.3.6-5_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.3-1_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
 Unpacking g++-4.0 (from .../g++-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package g++.
-Unpacking g++ (from .../g++_4%3a4.0.3-1_amd64.deb) ...
+Unpacking g++ (from .../g++_4%3a4.0.3-3_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.2_amd64.deb) ...
 Setting up binutils (2.16.1cvs20060117-1) ...
 
 Setting up cpp-4.0 (4.0.3-1) ...
-Setting up cpp (4.0.3-1) ...
+Setting up cpp (4.0.3-3) ...
 
 Setting up libdb4.4 (4.4.20-4) ...
 Setting up patch (2.5.9-4) ...
 Setting up make (3.80+3.81.rc2-1) ...
 Setting up gcc-4.0 (4.0.3-1) ...
-Setting up gcc (4.0.3-1) ...
+Setting up gcc (4.0.3-3) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-2.1) ...
-Setting up libc6-dev (2.3.6-4) ...
-Setting up perl-modules (5.8.8-3) ...
+Setting up libc6-dev (2.3.6-5) ...
+Setting up perl-modules (5.8.8-4) ...
 Setting up g++-4.0 (4.0.3-1) ...
 Setting up libstdc++6-4.0-dev (4.0.3-1) ...
 
-Setting up g++ (4.0.3-1) ...
+Setting up g++ (4.0.3-3) ...
 
-Setting up perl (5.8.8-3) ...
+Setting up perl (5.8.8-4) ...
 
 Setting up dpkg-dev (1.13.17) ...
 Setting up build-essential (11.2) ...
 Copying back the cached apt archive contents
- -> new cache content gcc-4.1-base_4.1.0-1_amd64.deb added
- -> new cache content libdevmapper1.02_2%3a1.02.03-1_amd64.deb added
- -> new cache content libgcc1_1%3a4.1.0-1_amd64.deb added
- -> new cache content libstdc++6_4.1.0-1_amd64.deb added
- -> new cache content libusb-0.1-4_2%3a0.1.12-1_amd64.deb added
- -> new cache content manpages_2.23-1_all.deb added
+ -> new cache content nano_1.3.11-2_amd64.deb added
 umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//19135/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//14202/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//19135 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14202 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 5cd8cc2..cef47ad 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//22594/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//19309/etc/mtab' to `../proc/mounts': 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//22594 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19309 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sarge.log b/testsuite/normal/pbuilder-execute-sarge.log
index b8885a9..b2a9b55 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//16168/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//12088/etc/mtab' to `../proc/mounts': 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//16168 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12088 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index eab5a8d..9aa0370 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//16772/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//12253/etc/mtab' to `../proc/mounts': 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//16772 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12253 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index 3984052..35ca89d 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//25110/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//22014/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -16,8 +16,8 @@ Get:2 http://ftp.jp.debian.org experimental Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org experimental/main Packages [158kB]
-Fetched 163kB in 9s (18.0kB/s)
+Get:4 http://ftp.jp.debian.org experimental/main Packages [162kB]
+Fetched 166kB in 2s (80.9kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -30,15 +30,15 @@ The following packages will be upgraded:
 4 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
 Need to get 0B/2979kB of archives.
 After unpacking 315kB of additional disk space will be used.
-(Reading database ... 11265 files and directories currently installed.)
+(Reading database ... 11285 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 ... 11273 files and directories currently installed.)
+(Reading database ... 11293 files and directories currently installed.)
 Preparing to replace lsb-base 3.0-16 (using .../lsb-base_3.1-1_all.deb) ...
 Unpacking replacement lsb-base ...
 Setting up lsb-base (3.1-1) ...
-(Reading database ... 11273 files and directories currently installed.)
+(Reading database ... 11293 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace gettext-base 0.14.5-2 (using .../gettext-base_0.14.5-2.csharp.1_amd64.deb) ...
@@ -64,10 +64,10 @@ The following packages will be upgraded:
 2 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
 Need to get 0B/1535kB of archives.
 After unpacking 9683kB disk space will be freed.
-(Reading database ... 11273 files and directories currently installed.)
+(Reading database ... 11293 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 11068 files and directories currently installed.)
+(Reading database ... 11088 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.3 (using .../apt-utils_0.6.43.3exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.3 (using .../apt_0.6.43.3exp1_amd64.deb) ...
@@ -83,9 +83,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//25110/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//22014/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25110 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//22014 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index f3af8f8..90ecb1e 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//23433/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//20218/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -12,8 +12,8 @@ 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 [5902B]
-Get:3 http://ftp.jp.debian.org sid/main Packages [4028kB]
-Fetched 4034kB in 27s (148kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [4043kB]
+Fetched 4049kB in 2s (1986kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -22,83 +22,95 @@ Building dependency tree...
 The following packages will be REMOVED:
   libnewt0.51
 The following NEW packages will be installed:
-  gcc-4.1-base libnewt0.52
+  libdevmapper1.02 libnewt0.52
 The following packages will be upgraded:
-  bash coreutils cpp dmidecode g++ gcc info initscripts klogd libacl1 libattr1
-  libc6 libc6-dev libdb4.2 libdb4.3 libdb4.4 libgcc1 libreadline5 libsasl2
-  libselinux1 libsepol1 libslang2 libssl0.9.8 libstdc++6 libusb-0.1-4 login
-  manpages nano netcat passwd readline-common sysklogd sysv-rc sysvinit
+  bash coreutils cpp cron debianutils dmidecode e2fslibs e2fsprogs g++ gcc
+  gnupg klogd libacl1 libattr1 libblkid1 libc6 libc6-dev libcomerr2 libdb4.2
+  libdb4.3 libdb4.4 libsasl2 libslang2 libss2 libssl0.9.8 libusb-0.1-4
+  libuuid1 login manpages nano passwd perl perl-base perl-modules sed sysklogd
   whiptail
-35 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/18.0MB of archives.
-After unpacking 1786kB of additional disk space will be used.
-(Reading database ... 11215 files and directories currently installed.)
-Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-4_amd64.deb) ...
+37 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0B/27.1MB of archives.
+After unpacking 1745kB of additional disk space will be used.
+(Reading database ... 11223 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-5_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-4_amd64.deb) ...
+Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-5_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.3.6-4) ...
+Setting up libc6 (2.3.6-5) ...
 Current default timezone: 'UTC'.
-Local time is now:      Mon Apr  3 03:38:34 UTC 2006.
-Universal Time is now:  Mon Apr  3 03:38:34 UTC 2006.
+Local time is now:      Sat Apr  8 03:22:20 UTC 2006.
+Universal Time is now:  Sat Apr  8 03:22:20 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11216 files and directories currently installed.)
+(Reading database ... 11224 files and directories currently installed.)
 Preparing to replace libslang2 2.0.5-3 (using .../libslang2_2.0.6-2_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.6-2) ...
 
-(Reading database ... 11216 files and directories currently installed.)
+(Reading database ... 11224 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-3_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 11215 files and directories currently installed.)
+(Reading database ... 11223 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 11154 files and directories currently installed.)
+(Reading database ... 11162 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-3_amd64.deb) ...
+Preparing to replace debianutils 2.15.3 (using .../debianutils_2.15.4_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.15.4) ...
+
+(Reading database ... 11229 files and directories currently installed.)
 Preparing to replace bash 3.1-2 (using .../archives/bash_3.1-4_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1-4) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 11224 files and directories currently installed.)
+(Reading database ... 11234 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.94-1_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.94-1) ...
 
-(Reading database ... 11245 files and directories currently installed.)
-Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-1_amd64.deb) ...
+Selecting previously deselected package libdevmapper1.02.
+(Reading database ... 11255 files and directories currently installed.)
+Unpacking libdevmapper1.02 (from .../libdevmapper1.02_2%3a1.02.03-1_amd64.deb) ...
+Setting up libdevmapper1.02 (1.02.03-1) ...
+
+(Reading database ... 11261 files and directories currently installed.)
+Preparing to replace e2fslibs 1.38+1.39-WIP-2005.12.31-1 (using .../e2fslibs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement e2fslibs ...
+Setting up e2fslibs (1.38+1.39-WIP-2006.03.29-2.1) ...
+
+(Reading database ... 11261 files and directories currently installed.)
+Preparing to replace e2fsprogs 1.38+1.39-WIP-2005.12.31-1 (using .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement e2fsprogs ...
+Setting up e2fsprogs (1.38+1.39-WIP-2006.03.29-2.1) ...
+(Reading database ... 11264 files and directories currently installed.)
+Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-3_amd64.deb) ...
 Unpacking replacement login ...
-Setting up login (4.0.15-1) ...
+Setting up login (4.0.15-3) ...
 Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 
-(Reading database ... 11250 files and directories currently installed.)
-Preparing to replace libsepol1 1.10-2 (using .../libsepol1_1.12-1_amd64.deb) ...
-Unpacking replacement libsepol1 ...
-Setting up libsepol1 (1.12-1) ...
-
-(Reading database ... 11250 files and directories currently installed.)
-Preparing to replace libselinux1 1.28-4 (using .../libselinux1_1.30-1_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.30-1) ...
-
-(Reading database ... 11250 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-13 (using .../sysvinit_2.86.ds1-14_amd64.deb) ...
-Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-14) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 11250 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-13 (using .../initscripts_2.86.ds1-14_amd64.deb) ...
-Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-14) ...
-Installing new version of config file /etc/init.d/umountfs ...
-
-(Reading database ... 11250 files and directories currently installed.)
+(Reading database ... 11269 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.8-3 (using .../perl-modules_5.8.8-4_all.deb) ...
+Unpacking replacement perl-modules ...
+Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) ...
+Unpacking replacement libdb4.4 ...
+Preparing to replace perl 5.8.8-3 (using .../perl_5.8.8-4_amd64.deb) ...
+Unpacking replacement perl ...
+Preparing to replace perl-base 5.8.8-3 (using .../perl-base_5.8.8-4_amd64.deb) ...
+Unpacking replacement perl-base ...
+Setting up perl-base (5.8.8-4) ...
+(Reading database ... 11269 files and directories currently installed.)
+Preparing to replace sed 4.1.4-5 (using .../archives/sed_4.1.4-7_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.4-7) ...
+
+(Reading database ... 11270 files and directories currently installed.)
 Preparing to replace libattr1 2.4.31-1 (using .../libattr1_2.4.32-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.35-1 (using .../libacl1_2.2.36-1_amd64.deb) ...
@@ -107,103 +119,98 @@ Setting up libattr1 (2.4.32-1) ...
 
 Setting up libacl1 (2.2.36-1) ...
 
-Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 11250 files and directories currently installed.)
-Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
-Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-1_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.0-1) ...
-
-Setting up libgcc1 (4.1.0-1) ...
-
-(Reading database ... 11258 files and directories currently installed.)
-Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-1_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.0-1) ...
-
-(Reading database ... 11258 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-13 (using .../sysv-rc_2.86.ds1-14_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-14) ...
-
-(Reading database ... 11258 files and directories currently installed.)
+(Reading database ... 11270 files and directories currently installed.)
+Preparing to replace libblkid1 1.38+1.39-WIP-2005.12.31-1 (using .../libblkid1_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libblkid1 ...
+Setting up libblkid1 (1.38+1.39-WIP-2006.03.29-2.1) ...
+
+(Reading database ... 11270 files and directories currently installed.)
+Preparing to replace libcomerr2 1.38+1.39-WIP-2005.12.31-1 (using .../libcomerr2_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libcomerr2 ...
+Setting up libcomerr2 (1.38+1.39-WIP-2006.03.29-2.1) ...
+
+(Reading database ... 11270 files and directories currently installed.)
+Preparing to replace libss2 1.38+1.39-WIP-2005.12.31-1 (using .../libss2_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libss2 ...
+Setting up libss2 (1.38+1.39-WIP-2006.03.29-2.1) ...
+
+(Reading database ... 11270 files and directories currently installed.)
+Preparing to replace libuuid1 1.38+1.39-WIP-2005.12.31-1 (using .../libuuid1_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libuuid1 ...
+Setting up libuuid1 (1.38+1.39-WIP-2006.03.29-2.1) ...
+
+(Reading database ... 11270 files and directories currently installed.)
+Preparing to replace cron 3.0pl1-93 (using .../cron_3.0pl1-94_amd64.deb) ...
+Unpacking replacement cron ...
 Preparing to replace dmidecode 2.8-1 (using .../dmidecode_2.8-2_amd64.deb) ...
 Unpacking replacement dmidecode ...
-Preparing to replace info 4.8-6 (using .../archives/info_4.8-8_amd64.deb) ...
-Unpacking replacement info ...
+Preparing to replace libusb-0.1-4 2:0.1.11-4 (using .../libusb-0.1-4_2%3a0.1.12-2_amd64.deb) ...
+Unpacking replacement libusb-0.1-4 ...
+Preparing to replace gnupg 1.4.2.2-1 (using .../gnupg_1.4.3-1_amd64.deb) ...
+Unpacking replacement gnupg ...
 Preparing to replace sysklogd 1.4.1-17 (using .../sysklogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement sysklogd ...
 Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace libdb4.2 4.2.52-23.1 (using .../libdb4.2_4.2.52-24_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
-Preparing to replace libsasl2 2.1.19-1.9 (using .../libsasl2_2.1.19-1.9+b1_amd64.deb) ...
+Preparing to replace libsasl2 2.1.19-1.9 (using .../libsasl2_2.1.19.dfsg1-0.1_amd64.deb) ...
 Unpacking replacement libsasl2 ...
 Preparing to replace libssl0.9.8 0.9.8a-7 (using .../libssl0.9.8_0.9.8a-8_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
-Preparing to replace libusb-0.1-4 2:0.1.11-4 (using .../libusb-0.1-4_2%3a0.1.12-1_amd64.deb) ...
-Unpacking replacement libusb-0.1-4 ...
-Preparing to replace manpages 2.22-1 (using .../manpages_2.23-1_all.deb) ...
+Preparing to replace manpages 2.22-1 (using .../manpages_2.25-1_all.deb) ...
 Unpacking replacement manpages ...
-Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-1_amd64.deb) ...
+Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-2_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace netcat 1.10-31 (using .../netcat_1.10-32_amd64.deb) ...
-Unpacking replacement netcat ...
 Preparing to replace libdb4.3 4.3.29-4.1 (using .../libdb4.3_4.3.29-5_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
-Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-1_amd64.deb) ...
+Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-3_amd64.deb) ...
 Unpacking replacement passwd ...
-Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-3_amd64.deb) ...
 Unpacking replacement cpp ...
-Preparing to replace gcc 4:4.0.2-2 (using .../gcc_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace gcc 4:4.0.2-2 (using .../gcc_4%3a4.0.3-3_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
-Preparing to replace g++ 4:4.0.2-2 (using .../g++_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace g++ 4:4.0.2-2 (using .../g++_4%3a4.0.3-3_amd64.deb) ...
 Unpacking replacement g++ ...
-Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) ...
-Unpacking replacement libdb4.4 ...
-Preparing to replace readline-common 5.1-6 (using .../readline-common_5.1-7_all.deb) ...
-Unpacking replacement readline-common ...
-Preparing to replace libreadline5 5.1-6 (using .../libreadline5_5.1-7_amd64.deb) ...
-Unpacking replacement libreadline5 ...
-Setting up libc6-dev (2.3.6-4) ...
+Setting up libc6-dev (2.3.6-5) ...
 Setting up libnewt0.52 (0.52.2-3) ...
 
 Setting up whiptail (0.52.2-3) ...
+Setting up libdb4.4 (4.4.20-4) ...
+Setting up cron (3.0pl1-94) ...
+
 Setting up dmidecode (2.8-2) ...
-Setting up info (4.8-8) ...
+Setting up libusb-0.1-4 (0.1.12-2) ...
 
+Setting up gnupg (1.4.3-1) ...
 Setting up libdb4.2 (4.2.52-24) ...
-Setting up libsasl2 (2.1.19-1.9+b1) ...
+Setting up libsasl2 (2.1.19.dfsg1-0.1) ...
 
 Setting up libssl0.9.8 (0.9.8a-8) ...
 
-Setting up libusb-0.1-4 (0.1.12-1) ...
+Setting up manpages (2.25-1) ...
+Setting up nano (1.3.11-2) ...
+Installing new version of config file /etc/nanorc ...
 
-Setting up manpages (2.23-1) ...
-Setting up nano (1.3.11-1) ...
-
-Setting up netcat (1.10-32) ...
 Setting up libdb4.3 (4.3.29-5) ...
-Setting up passwd (4.0.15-1) ...
-
-Setting up cpp (4.0.3-1) ...
+Setting up passwd (4.0.15-3) ...
 
-Setting up gcc (4.0.3-1) ...
+Setting up cpp (4.0.3-3) ...
 
-Setting up g++ (4.0.3-1) ...
+Setting up gcc (4.0.3-3) ...
 
-Setting up libdb4.4 (4.4.20-4) ...
-Setting up readline-common (5.1-7) ...
-
-Setting up libreadline5 (5.1-7) ...
+Setting up g++ (4.0.3-3) ...
 
 Setting up sysklogd (1.4.1-17.1) ...
 
+Setting up perl-modules (5.8.8-4) ...
 Setting up klogd (1.4.1-17.1) ...
 Installing new version of config file /etc/init.d/klogd ...
 Stopping kernel log daemon: klogd.
 
+Setting up perl (5.8.8-4) ...
+
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -217,9 +224,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//23433/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//20218/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23433 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//20218 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 6667325..91b4317 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//24101/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//20356/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,9 +18,9 @@ Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Ign http://ftp.jp.debian.org experimental Release
 Get:4 http://ftp.jp.debian.org sid Release [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [158kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [162kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 169kB in 3s (48.4kB/s)
+Fetched 172kB in 0s (466kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -34,21 +34,19 @@ The following packages have been kept back:
 The following packages will be upgraded:
   aptitude diff gettext-base lsb-base
 4 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
-Need to get 13.2kB/2979kB of archives.
+Need to get 0B/2979kB of archives.
 After unpacking 315kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   diff lsb-base aptitude gettext-base
-Get:1 http://ftp.jp.debian.org experimental/main lsb-base 3.1-1 [13.2kB]
-Fetched 13.2kB in 3s (4150B/s)
-(Reading database ... 12586 files and directories currently installed.)
+(Reading database ... 12602 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 ... 12594 files and directories currently installed.)
+(Reading database ... 12610 files and directories currently installed.)
 Preparing to replace lsb-base 3.0-16 (using .../lsb-base_3.1-1_all.deb) ...
 Unpacking replacement lsb-base ...
 Setting up lsb-base (3.1-1) ...
-(Reading database ... 12594 files and directories currently installed.)
+(Reading database ... 12610 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace gettext-base 0.14.5-2 (using .../gettext-base_0.14.5-2.csharp.1_amd64.deb) ...
@@ -76,10 +74,10 @@ Need to get 0B/1535kB of archives.
 After unpacking 9683kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
   apt-utils apt
-(Reading database ... 12594 files and directories currently installed.)
+(Reading database ... 12610 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 12389 files and directories currently installed.)
+(Reading database ... 12405 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.3 (using .../apt-utils_0.6.43.3exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.3 (using .../apt_0.6.43.3exp1_amd64.deb) ...
@@ -89,16 +87,15 @@ Setting up apt (0.6.43.3exp1) ...
 Setting up apt-utils (0.6.43.3exp1) ...
 
 Copying back the cached apt archive contents
- -> new cache content lsb-base_3.1-1_all.deb added
 umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//24101/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//20356/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24101 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//20356 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid.log b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
index 8e4aaf7..a005bc0 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//22182/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//18258/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -13,8 +13,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [4028kB]
-Fetched 4034kB in 18s (223kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [4043kB]
+Fetched 4049kB in 2s (1785kB/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,89 +25,105 @@ Building dependency tree...
 The following packages will be REMOVED:
   libnewt0.51
 The following NEW packages will be installed:
-  gcc-4.1-base libnewt0.52
+  libdevmapper1.02 libnewt0.52
 The following packages will be upgraded:
-  base-config bash console-data coreutils cpp dmidecode exim4 exim4-base
-  exim4-config exim4-daemon-light g++ gcc info initscripts klogd libacl1
-  libattr1 libc6 libc6-dev libdb4.2 libdb4.3 libdb4.4 libgcc1 libselinux1
-  libsepol1 libslang2 libssl0.9.8 libstdc++6 login manpages nano passwd
-  pciutils sysklogd sysv-rc sysvinit whiptail
-37 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/20.4MB of archives.
-After unpacking 1606kB of additional disk space will be used.
+  base-config bash console-data coreutils cpp cron debianutils dmidecode
+  e2fslibs e2fsprogs exim4 exim4-base exim4-config exim4-daemon-light g++ gcc
+  klogd libacl1 libattr1 libblkid1 libc6 libc6-dev libcomerr2 libdb4.2
+  libdb4.3 libdb4.4 libperl5.8 libslang2 libss2 libssl0.9.7 libssl0.9.8
+  libuuid1 login manpages nano passwd pciutils perl perl-base perl-modules sed
+  sysklogd whiptail
+43 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0B/28.6MB of archives.
+After unpacking 1765kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  libc6-dev libc6 libslang2 whiptail libnewt0.52 bash coreutils login
-  libsepol1 libselinux1 sysvinit initscripts libattr1 libacl1 gcc-4.1-base
-  libgcc1 libstdc++6 sysv-rc dmidecode info sysklogd klogd libssl0.9.8
-  manpages nano libdb4.3 passwd cpp libdb4.2 exim4-config exim4-base
-  exim4-daemon-light exim4 gcc g++ libdb4.4 console-data pciutils base-config
-(Reading database ... 12650 files and directories currently installed.)
-Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-4_amd64.deb) ...
+  libc6-dev libc6 libslang2 whiptail libnewt0.52 debianutils bash coreutils
+  libdevmapper1.02 e2fslibs e2fsprogs login perl-modules libdb4.4 perl
+  libperl5.8 perl-base sed libattr1 libacl1 libblkid1 libcomerr2 libss2
+  libuuid1 cron dmidecode sysklogd klogd libssl0.9.8 manpages nano libdb4.3
+  passwd cpp libdb4.2 exim4-daemon-light exim4-config exim4-base exim4 gcc g++
+  console-data pciutils base-config libssl0.9.7
+(Reading database ... 12658 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-5_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-4_amd64.deb) ...
+Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-5_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.3.6-4) ...
+Setting up libc6 (2.3.6-5) ...
 Current default timezone: 'UTC'.
-Local time is now:      Mon Apr  3 03:26:48 UTC 2006.
-Universal Time is now:  Mon Apr  3 03:26:48 UTC 2006.
+Local time is now:      Sat Apr  8 03:14:15 UTC 2006.
+Universal Time is now:  Sat Apr  8 03:14:15 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 12651 files and directories currently installed.)
+(Reading database ... 12659 files and directories currently installed.)
 Preparing to replace libslang2 2.0.5-3 (using .../libslang2_2.0.6-2_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.6-2) ...
 
-(Reading database ... 12651 files and directories currently installed.)
+(Reading database ... 12659 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-3_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 12650 files and directories currently installed.)
+(Reading database ... 12658 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 12589 files and directories currently installed.)
+(Reading database ... 12597 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-3_amd64.deb) ...
+Preparing to replace debianutils 2.15.3 (using .../debianutils_2.15.4_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.15.4) ...
+
+(Reading database ... 12664 files and directories currently installed.)
 Preparing to replace bash 3.1-2 (using .../archives/bash_3.1-4_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1-4) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 12659 files and directories currently installed.)
+(Reading database ... 12669 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.94-1_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.94-1) ...
 
-(Reading database ... 12679 files and directories currently installed.)
-Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-1_amd64.deb) ...
+Selecting previously deselected package libdevmapper1.02.
+(Reading database ... 12689 files and directories currently installed.)
+Unpacking libdevmapper1.02 (from .../libdevmapper1.02_2%3a1.02.03-1_amd64.deb) ...
+Setting up libdevmapper1.02 (1.02.03-1) ...
+
+(Reading database ... 12695 files and directories currently installed.)
+Preparing to replace e2fslibs 1.38+1.39-WIP-2005.12.31-1 (using .../e2fslibs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement e2fslibs ...
+Setting up e2fslibs (1.38+1.39-WIP-2006.03.29-2.1) ...
+
+(Reading database ... 12695 files and directories currently installed.)
+Preparing to replace e2fsprogs 1.38+1.39-WIP-2005.12.31-1 (using .../e2fsprogs_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement e2fsprogs ...
+Setting up e2fsprogs (1.38+1.39-WIP-2006.03.29-2.1) ...
+(Reading database ... 12698 files and directories currently installed.)
+Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-3_amd64.deb) ...
 Unpacking replacement login ...
-Setting up login (4.0.15-1) ...
+Setting up login (4.0.15-3) ...
 Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 
-(Reading database ... 12684 files and directories currently installed.)
-Preparing to replace libsepol1 1.10-2 (using .../libsepol1_1.12-1_amd64.deb) ...
-Unpacking replacement libsepol1 ...
-Setting up libsepol1 (1.12-1) ...
-
-(Reading database ... 12684 files and directories currently installed.)
-Preparing to replace libselinux1 1.28-4 (using .../libselinux1_1.30-1_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.30-1) ...
-
-(Reading database ... 12684 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-13 (using .../sysvinit_2.86.ds1-14_amd64.deb) ...
-Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-14) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 12684 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-13 (using .../initscripts_2.86.ds1-14_amd64.deb) ...
-Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-14) ...
-Installing new version of config file /etc/init.d/umountfs ...
-
-(Reading database ... 12684 files and directories currently installed.)
+(Reading database ... 12703 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.8-3 (using .../perl-modules_5.8.8-4_all.deb) ...
+Unpacking replacement perl-modules ...
+Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) ...
+Unpacking replacement libdb4.4 ...
+Preparing to replace perl 5.8.8-3 (using .../perl_5.8.8-4_amd64.deb) ...
+Unpacking replacement perl ...
+Preparing to replace libperl5.8 5.8.8-3 (using .../libperl5.8_5.8.8-4_amd64.deb) ...
+Unpacking replacement libperl5.8 ...
+Preparing to replace perl-base 5.8.8-3 (using .../perl-base_5.8.8-4_amd64.deb) ...
+Unpacking replacement perl-base ...
+Setting up perl-base (5.8.8-4) ...
+(Reading database ... 12703 files and directories currently installed.)
+Preparing to replace sed 4.1.4-5 (using .../archives/sed_4.1.4-7_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.4-7) ...
+
+(Reading database ... 12704 files and directories currently installed.)
 Preparing to replace libattr1 2.4.31-1 (using .../libattr1_2.4.32-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.35-1 (using .../libacl1_2.2.36-1_amd64.deb) ...
@@ -116,101 +132,106 @@ Setting up libattr1 (2.4.32-1) ...
 
 Setting up libacl1 (2.2.36-1) ...
 
-Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 12684 files and directories currently installed.)
-Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
-Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-1_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.0-1) ...
+(Reading database ... 12704 files and directories currently installed.)
+Preparing to replace libblkid1 1.38+1.39-WIP-2005.12.31-1 (using .../libblkid1_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libblkid1 ...
+Setting up libblkid1 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-Setting up libgcc1 (4.1.0-1) ...
+(Reading database ... 12704 files and directories currently installed.)
+Preparing to replace libcomerr2 1.38+1.39-WIP-2005.12.31-1 (using .../libcomerr2_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libcomerr2 ...
+Setting up libcomerr2 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-(Reading database ... 12692 files and directories currently installed.)
-Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-1_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.0-1) ...
+(Reading database ... 12704 files and directories currently installed.)
+Preparing to replace libss2 1.38+1.39-WIP-2005.12.31-1 (using .../libss2_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libss2 ...
+Setting up libss2 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-(Reading database ... 12692 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-13 (using .../sysv-rc_2.86.ds1-14_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-14) ...
+(Reading database ... 12704 files and directories currently installed.)
+Preparing to replace libuuid1 1.38+1.39-WIP-2005.12.31-1 (using .../libuuid1_1.38+1.39-WIP-2006.03.29-2.1_amd64.deb) ...
+Unpacking replacement libuuid1 ...
+Setting up libuuid1 (1.38+1.39-WIP-2006.03.29-2.1) ...
 
-(Reading database ... 12692 files and directories currently installed.)
+(Reading database ... 12704 files and directories currently installed.)
+Preparing to replace cron 3.0pl1-93 (using .../cron_3.0pl1-94_amd64.deb) ...
+Unpacking replacement cron ...
 Preparing to replace dmidecode 2.8-1 (using .../dmidecode_2.8-2_amd64.deb) ...
 Unpacking replacement dmidecode ...
-Preparing to replace info 4.8-6 (using .../archives/info_4.8-8_amd64.deb) ...
-Unpacking replacement info ...
 Preparing to replace sysklogd 1.4.1-17 (using .../sysklogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement sysklogd ...
 Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace libssl0.9.8 0.9.8a-7 (using .../libssl0.9.8_0.9.8a-8_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
-Preparing to replace manpages 2.22-1 (using .../manpages_2.23-1_all.deb) ...
+Preparing to replace manpages 2.22-1 (using .../manpages_2.25-1_all.deb) ...
 Unpacking replacement manpages ...
-Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-1_amd64.deb) ...
+Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-2_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace libdb4.3 4.3.29-4.1 (using .../libdb4.3_4.3.29-5_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
-Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-1_amd64.deb) ...
+Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-3_amd64.deb) ...
 Unpacking replacement passwd ...
-Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-3_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace libdb4.2 4.2.52-23.1 (using .../libdb4.2_4.2.52-24_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
-Preparing to replace exim4-config 4.60-4 (using .../exim4-config_4.60-5_all.deb) ...
+Preparing to replace exim4-daemon-light 4.60-4 (using .../exim4-daemon-light_4.61-1_amd64.deb) ...
+Unpacking replacement exim4-daemon-light ...
+Preparing to replace exim4-config 4.60-4 (using .../exim4-config_4.61-1_all.deb) ...
 Unpacking replacement exim4-config ...
-Preparing to replace exim4-base 4.60-4 (using .../exim4-base_4.60-5+b1_amd64.deb) ...
+Preparing to replace exim4-base 4.60-4 (using .../exim4-base_4.61-1_amd64.deb) ...
 Unpacking replacement exim4-base ...
-Preparing to replace exim4-daemon-light 4.60-4 (using .../exim4-daemon-light_4.60-5+b1_amd64.deb) ...
-Unpacking replacement exim4-daemon-light ...
-Preparing to replace exim4 4.60-4 (using .../archives/exim4_4.60-5_all.deb) ...
+Preparing to replace exim4 4.60-4 (using .../archives/exim4_4.61-1_all.deb) ...
 Unpacking replacement exim4 ...
-Preparing to replace gcc 4:4.0.2-2 (using .../gcc_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace gcc 4:4.0.2-2 (using .../gcc_4%3a4.0.3-3_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
-Preparing to replace g++ 4:4.0.2-2 (using .../g++_4%3a4.0.3-1_amd64.deb) ...
+Preparing to replace g++ 4:4.0.2-2 (using .../g++_4%3a4.0.3-3_amd64.deb) ...
 Unpacking replacement g++ ...
-Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) ...
-Unpacking replacement libdb4.4 ...
 Preparing to replace console-data 2002.12.04dbs-52.2 (using .../console-data_20060317_all.deb) ...
 Unpacking replacement console-data ...
 Preparing to replace pciutils 1:2.1.11-15.3 (using .../pciutils_1%3a2.1.11-16_amd64.deb) ...
 Unpacking replacement pciutils ...
 Preparing to replace base-config 2.53.10-0.0.0.1.pure64 (using .../base-config_2.76_all.deb) ...
 Unpacking replacement base-config ...
-Setting up libc6-dev (2.3.6-4) ...
+Preparing to replace libssl0.9.7 0.9.7g-5 (using .../libssl0.9.7_0.9.7i-1_amd64.deb) ...
+Unpacking replacement libssl0.9.7 ...
+Setting up libc6-dev (2.3.6-5) ...
 Setting up libnewt0.52 (0.52.2-3) ...
 
 Setting up whiptail (0.52.2-3) ...
-Setting up dmidecode (2.8-2) ...
-Setting up info (4.8-8) ...
+Setting up libdb4.4 (4.4.20-4) ...
+Setting up libperl5.8 (5.8.8-4) ...
 
+Setting up cron (3.0pl1-94) ...
+
+Setting up dmidecode (2.8-2) ...
 Setting up libssl0.9.8 (0.9.8a-8) ...
 
-Setting up manpages (2.23-1) ...
-Setting up nano (1.3.11-1) ...
+Setting up manpages (2.25-1) ...
+Setting up nano (1.3.11-2) ...
+Installing new version of config file /etc/nanorc ...
 
 Setting up libdb4.3 (4.3.29-5) ...
-Setting up passwd (4.0.15-1) ...
+Setting up passwd (4.0.15-3) ...
 
-Setting up cpp (4.0.3-1) ...
+Setting up cpp (4.0.3-3) ...
 
 Setting up libdb4.2 (4.2.52-24) ...
-Setting up exim4-config (4.60-5) ...
+Setting up exim4-config (4.61-1) ...
 Installing new version of config file /etc/exim4/conf.d/acl/20_exim4-config_whitelist_local_deny ...
+Installing new version of config file /etc/exim4/conf.d/main/02_exim4-config_options ...
 Installing new version of config file /etc/exim4/exim4.conf.template ...
 
-Setting up exim4-base (4.60-5+b1) ...
+Setting up exim4-base (4.61-1) ...
 
-Setting up exim4-daemon-light (4.60-5+b1) ...
+Setting up exim4-daemon-light (4.61-1) ...
 
-Setting up exim4 (4.60-5) ...
-Setting up gcc (4.0.3-1) ...
+Setting up exim4 (4.61-1) ...
+Setting up gcc (4.0.3-3) ...
 
-Setting up g++ (4.0.3-1) ...
+Setting up g++ (4.0.3-3) ...
 
-Setting up libdb4.4 (4.4.20-4) ...
 Setting up console-data (20060317) ...
 Looking for keymap to install:
 NONE
@@ -219,12 +240,17 @@ Setting up pciutils (2.1.11-16) ...
 
 Setting up base-config (2.76) ...
 
+Setting up libssl0.9.7 (0.9.7i-1) ...
+
 Setting up sysklogd (1.4.1-17.1) ...
 
+Setting up perl-modules (5.8.8-4) ...
 Setting up klogd (1.4.1-17.1) ...
 Installing new version of config file /etc/init.d/klogd ...
 Stopping kernel log daemon: klogd.
 
+Setting up perl (5.8.8-4) ...
+
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -238,9 +264,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//22182/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//18258/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22182 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//18258 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch.log b/testsuite/normal/pbuilder-update-sarge-etch.log
index c17f970..3b809ca 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch.log
@@ -1,26 +1,26 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//17003/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//12997/etc/mtab' to `../proc/mounts': 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 [3730kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3738kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3730kB in 2s (1777kB/s)
+Fetched 3738kB in 2s (1868kB/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 NEW packages will be installed:
-  cpp-4.0 dmidecode g++-4.0 gcc-4.0 gcc-4.0-base laptop-detect libdb4.3
-  libdb4.4 libgnutls12 libncursesw5 libpcap0.8 libselinux1 libsepol1
+  cpp-4.0 dmidecode g++-4.0 gcc-4.0 gcc-4.0-base gcc-4.1-base laptop-detect
+  libdb4.3 libdb4.4 libgnutls12 libncursesw5 libpcap0.8 libselinux1 libsepol1
   libsigc++-2.0-0c2a libslang2 libssl0.9.8 libstdc++6 libstdc++6-4.0-dev
   lsb-base
 The following packages will be upgraded:
@@ -41,9 +41,9 @@ The following packages will be upgraded:
   net-tools netbase netkit-inetd passwd patch pciutils perl perl-base
   perl-modules ppp pppconfig pppoeconf procps psmisc sed sysv-rc sysvinit tar
   tasksel tcpd telnet util-linux wget whiptail zlib1g
-123 upgraded, 19 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/64.9MB of archives.
-After unpacking 39.6MB of additional disk space will be used.
+123 upgraded, 20 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/65.2MB of archives.
+After unpacking 39.9MB of additional disk space will be used.
 (Reading database ... 10950 files and directories currently installed.)
 Preparing to replace linux-kernel-headers 2.5.999-test7-bk-17 (using .../linux-kernel-headers_2.6.13+0rc3-2.1_amd64.deb) ...
 Unpacking replacement linux-kernel-headers ...
@@ -76,8 +76,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-3) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Mon Apr  3 03:25:04 UTC 2006.
-Universal Time is now:  Mon Apr  3 03:25:04 UTC 2006.
+Local time is now:      Sat Apr  8 03:12:38 UTC 2006.
+Universal Time is now:  Sat Apr  8 03:12:38 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11262 files and directories currently installed.)
@@ -167,13 +167,13 @@ Selecting previously deselected package libdb4.3.
 (Reading database ... 11281 files and directories currently installed.)
 Unpacking libdb4.3 (from .../libdb4.3_4.3.29-4.1_amd64.deb) ...
 Selecting previously deselected package libsepol1.
-Unpacking libsepol1 (from .../libsepol1_1.10-2_amd64.deb) ...
-Setting up libsepol1 (1.10-2) ...
+Unpacking libsepol1 (from .../libsepol1_1.12-1_amd64.deb) ...
+Setting up libsepol1 (1.12-1) ...
 
 Selecting previously deselected package libselinux1.
 (Reading database ... 11290 files and directories currently installed.)
-Unpacking libselinux1 (from .../libselinux1_1.28-4_amd64.deb) ...
-Setting up libselinux1 (1.28-4) ...
+Unpacking libselinux1 (from .../libselinux1_1.30-1_amd64.deb) ...
+Setting up libselinux1 (1.30-1) ...
 
 (Reading database ... 11295 files and directories currently installed.)
 Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3.1_all.deb) ...
@@ -230,14 +230,14 @@ Unpacking replacement sed ...
 Setting up sed (4.1.4-5) ...
 
 (Reading database ... 11865 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-13_all.deb) ...
+Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-14_all.deb) ...
 Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-13) ...
+Setting up sysv-rc (2.86.ds1-14) ...
 
 (Reading database ... 11875 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-13_amd64.deb) ...
+Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-14_amd64.deb) ...
 Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-13) ...
+Setting up sysvinit (2.86.ds1-14) ...
 init: timeout opening/writing control channel /dev/initctl
 
 (Reading database ... 11877 files and directories currently installed.)
@@ -328,18 +328,18 @@ Setting up debconf (1.4.72) ...
 (Reading database ... 11934 files and directories currently installed.)
 Preparing to replace console-common 0.7.49 (using .../console-common_0.7.55.1_all.deb) ...
 Unpacking replacement console-common ...
-Selecting previously deselected package gcc-4.0-base.
-Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
-Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.0.3-1_amd64.deb) ...
+Selecting previously deselected package gcc-4.1-base.
+Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
+Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.1.0-1_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.0-base (4.0.3-1) ...
+Setting up gcc-4.1-base (4.1.0-1) ...
 
-Setting up libgcc1 (4.0.3-1) ...
+Setting up libgcc1 (4.1.0-1) ...
 
 Selecting previously deselected package libstdc++6.
 (Reading database ... 11947 files and directories currently installed.)
-Unpacking libstdc++6 (from .../libstdc++6_4.0.3-1_amd64.deb) ...
-Setting up libstdc++6 (4.0.3-1) ...
+Unpacking libstdc++6 (from .../libstdc++6_4.1.0-1_amd64.deb) ...
+Setting up libstdc++6 (4.1.0-1) ...
 
 (Reading database ... 11950 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.43.3_amd64.deb) ...
@@ -360,10 +360,10 @@ Unpacking replacement dselect ...
 Setting up dselect (1.13.17) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
 (Reading database ... 12006 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-13_amd64.deb) ...
+Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-14_amd64.deb) ...
 Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
 Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-13) ...
+Setting up initscripts (2.86.ds1-14) ...
 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 ...
@@ -490,7 +490,7 @@ Preparing to replace gettext-base 0.14.4-2 (using .../gettext-base_0.14.5-2_amd6
 Unpacking replacement gettext-base ...
 Preparing to replace groff-base 1.18.1.1-7 (using .../groff-base_1.18.1.1-11_amd64.deb) ...
 Unpacking replacement groff-base ...
-Preparing to replace info 4.7-2.2 (using .../archives/info_4.8-6_amd64.deb) ...
+Preparing to replace info 4.7-2.2 (using .../archives/info_4.8-8_amd64.deb) ...
 Unpacking replacement info ...
 Preparing to replace iptables 1.2.11-10 (using .../iptables_1.3.3-2_amd64.deb) ...
 Unpacking replacement iptables ...
@@ -520,6 +520,8 @@ Preparing to replace whiptail 0.51.6-20 (using .../whiptail_0.51.6-31_amd64.deb)
 Unpacking replacement whiptail ...
 Preparing to replace libnewt0.51 0.51.6-20 (using .../libnewt0.51_0.51.6-31_amd64.deb) ...
 Unpacking replacement libnewt0.51 ...
+Selecting previously deselected package gcc-4.0-base.
+Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
 Preparing to replace makedev 2.3.1-77 (using .../makedev_2.3.1-80_all.deb) ...
 Unpacking replacement makedev ...
 Preparing to replace procps 1:3.2.1-2 (using .../procps_1%3a3.2.6-2.1_amd64.deb) ...
@@ -675,7 +677,7 @@ Setting up gettext-base (0.14.5-2) ...
 
 Setting up groff-base (1.18.1.1-11) ...
 
-Setting up info (4.8-6) ...
+Setting up info (4.8-8) ...
 
 Setting up iptables (1.3.3-2) ...
 
@@ -707,6 +709,8 @@ Installing new version of config file /etc/wgetrc ...
 Setting up libnewt0.51 (0.51.6-31) ...
 
 Setting up whiptail (0.51.6-31) ...
+Setting up gcc-4.0-base (4.0.3-1) ...
+
 Setting up makedev (2.3.1-80) ...
 Installing new version of config file /etc/init.d/makedev ...
 
@@ -789,9 +793,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//17003/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//12997/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//17003 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12997 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 08576c3..d82a4f6 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/16220/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/12859/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -24,7 +24,7 @@ The following NEW packages will be installed:
 Need to get 0B/137kB of archives.
 After unpacking 758kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11215 files and directories currently installed.)
+(Reading database ... 11223 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.38_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.38_amd64.deb) ...
@@ -58,7 +58,7 @@ The following NEW packages will be installed:
 Need to get 0B/2910kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11312 files and directories currently installed.)
+(Reading database ... 11320 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -98,7 +98,7 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11906 files and directories currently installed.)
+(Reading database ... 11914 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
@@ -111,14 +111,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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -307,18 +307,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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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; \
@@ -331,26 +331,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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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
@@ -387,9 +387,9 @@ success
 success
 success
 a: 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
 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
@@ -401,7 +401,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
-Mon Apr  3 03:37:29 UTC 2006
+Sat Apr  8 03:21:15 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -471,14 +471,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
-Mon Apr  3 03:37:34 UTC 2006
+Sat Apr  8 03:21:20 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -487,9 +487,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -499,58 +499,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.c0ynuA/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.e6fnxW/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -589,6 +589,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.c0ynuA/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/16220 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/12859 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sarge.log b/testsuite/normal/pdebuild-internal-sarge.log
index bd70c4a..947811a 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9747/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/5661/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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
-Mon Apr  3 03:24:21 UTC 2006
+Sat Apr  8 03:11:30 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -469,7 +469,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
-Mon Apr  3 03:24:26 UTC 2006
+Sat Apr  8 03:11:35 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.e6fnxW/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9747 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/5661 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 0f37fb3..3715212 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.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/10334/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/5814/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -21,12 +21,10 @@ Recommended packages:
 The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 pbuilder
 0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
-Need to get 75.9kB/138kB of archives.
+Need to get 0B/138kB of archives.
 After unpacking 766kB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main pbuilder 0.151 [75.9kB]
-Fetched 75.9kB in 13s (5593B/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11271 files and directories currently installed.)
+(Reading database ... 11285 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.41_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.41_amd64.deb) ...
@@ -60,7 +58,7 @@ The following NEW packages will be installed:
 Need to get 0B/2911kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11368 files and directories currently installed.)
+(Reading database ... 11382 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -100,7 +98,7 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11962 files and directories currently installed.)
+(Reading database ... 11976 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
@@ -113,14 +111,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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -309,18 +307,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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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; \
@@ -333,26 +331,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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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
@@ -402,7 +400,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
-Mon Apr  3 03:05:31 UTC 2006
+Sat Apr  8 03:06:01 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -472,13 +470,13 @@ 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
-Mon Apr  3 03:05:36 UTC 2006
+Sat Apr  8 03:06:06 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -488,9 +486,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -500,58 +498,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.c0ynuA/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.e6fnxW/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/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.e6fnxW/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -588,9 +586,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.6-1_amd64.deb'.
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
- -> new cache content pbuilder_0.151_all.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/10334 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/5814 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index edb818c..f905996 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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 12:36:00 JST 2006
-pbuilder-time-stamp: 1144035360
+Current time: Sat Apr  8 12:19:19 JST 2006
+pbuilder-time-stamp: 1144466359
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9369/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/5968/etc/mtab' to `../proc/mounts': 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/2910kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11215 files and directories currently installed.)
+(Reading database ... 11223 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -105,13 +105,13 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11809 files and directories currently installed.)
+(Reading database ... 11817 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9369/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9369/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/5968/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/5968/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -436,11 +436,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
-Mon Apr  3 03:36:42 UTC 2006
+Sat Apr  8 03:20:11 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -510,13 +510,13 @@ 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
-Mon Apr  3 03:36:47 UTC 2006
+Sat Apr  8 03:20:16 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -640,7 +640,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: Mon Apr  3 12:36:49 JST 2006
-pbuilder-time-stamp: 1144035409
+Current time: Sat Apr  8 12:20:18 JST 2006
+pbuilder-time-stamp: 1144466418
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9369 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/5968 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index 020c1d8..dee01ae 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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 12:22:58 JST 2006
-pbuilder-time-stamp: 1144034578
+Current time: Sat Apr  8 12:09:47 JST 2006
+pbuilder-time-stamp: 1144465787
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/2896/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/31075/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -115,8 +115,8 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/2896/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/2896/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/31075/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/31075/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -402,7 +402,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
@@ -441,7 +440,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
-Mon Apr  3 03:23:33 UTC 2006
+Sat Apr  8 03:10:34 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -454,18 +453,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
@@ -480,6 +467,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
@@ -511,14 +510,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
-Mon Apr  3 03:23:38 UTC 2006
+Sat Apr  8 03:10:39 UTC 2006
 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
@@ -624,7 +623,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: Mon Apr  3 12:23:40 JST 2006
-pbuilder-time-stamp: 1144034620
+Current time: Sat Apr  8 12:10:41 JST 2006
+pbuilder-time-stamp: 1144465841
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/2896 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/31075 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 4dd942f..e817546 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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/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.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Apr  3 12:03:51 JST 2006
-pbuilder-time-stamp: 1144033431
+Current time: Sat Apr  8 12:04:02 JST 2006
+pbuilder-time-stamp: 1144465442
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/3499/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/31259/etc/mtab' to `../proc/mounts': 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/2911kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11271 files and directories currently installed.)
+(Reading database ... 11285 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -105,13 +105,13 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11865 files and directories currently installed.)
+(Reading database ... 11879 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/3499/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/3499/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/31259/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/31259/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -402,6 +402,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
@@ -440,7 +441,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
-Mon Apr  3 03:04:31 UTC 2006
+Sat Apr  8 03:04:57 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -510,14 +511,13 @@ 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
-Mon Apr  3 03:04:36 UTC 2006
+Sat Apr  8 03:05:02 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
-c: c
 b: b
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -640,7 +640,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: Mon Apr  3 12:04:38 JST 2006
-pbuilder-time-stamp: 1144033478
+Current time: Sat Apr  8 12:05:04 JST 2006
+pbuilder-time-stamp: 1144465504
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/3499 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.e6fnxW/dir3/31259 and its subdirectories
author	dancer <dancer>	2006-04-09 02:21:51 +0000
committer	dancer <dancer>	2006-04-09 02:21:51 +0000
commit	2145b0b4313e3ee3abd2c0a4649d6663961ccb2f (patch)
tree	7a885f381a3c4795bc05c74f844774101b7c1ee0 /testsuite
parent	0085d7461a7d1191a2fee4f035b0e7f6370871ef (diff)
download	pbuilder-2145b0b4313e3ee3abd2c0a4649d6663961ccb2f.tar pbuilder-2145b0b4313e3ee3abd2c0a4649d6663961ccb2f.tar.gz