0.129

40 files changed, 855 insertions, 550 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index 22c1aba..2124f9a 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 08:38:19 JST 2005
-pbuilder-time-stamp: 1124149099
+Current time: Wed Aug 17 08:09:50 JST 2005
+pbuilder-time-stamp: 1124233790
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -44,7 +44,7 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (1852kB/s)
+Fetched 2650kB in 1s (1750kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11328 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -90,16 +90,16 @@ The following NEW packages will be installed:
 Need to get 70.4kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.3 [70.4kB]
-Fetched 70.4kB in 0s (601kB/s)
+Fetched 70.4kB in 0s (534kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11871 files and directories currently installed.)
 Unpacking fakeroot (from .../archives/fakeroot_1.3_i386.deb) ...
 Setting up fakeroot (1.3) ...
 
 Copying source file
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -376,6 +376,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
@@ -401,8 +402,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -414,7 +415,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 Aug 15 23:39:02 UTC 2005
+Tue Aug 16 23:10:36 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -484,14 +485,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 Aug 15 23:39:07 UTC 2005
+Tue Aug 16 23:10:42 UTC 2005
 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
+a: a
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -595,10 +595,10 @@ debian: warning: no utmp entry available and LOGNAME not defined; using uid of p
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
+/usr/lib/pbuilder/pbuilder-buildpackage: line 135:  3524 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting dev/pts filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 89: 24294 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Tue Aug 16 08:39:10 JST 2005
-pbuilder-time-stamp: 1124149150
+Current time: Wed Aug 17 08:10:45 JST 2005
+pbuilder-time-stamp: 1124233845
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/23697 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/3229 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
index b83c727..d4ba66c 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 08:24:12 JST 2005
-pbuilder-time-stamp: 1124148252
+Current time: Wed Aug 17 07:55:00 JST 2005
+pbuilder-time-stamp: 1124232900
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -44,7 +44,7 @@ Get:7 http://ftp.jp.debian.org sarge/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sarge/main debhelper 4.2.32 [362kB]
 Get:9 http://ftp.jp.debian.org sarge/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2591kB in 1s (1799kB/s)
+Fetched 2591kB in 1s (2030kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11073 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -90,16 +90,16 @@ The following NEW packages will be installed:
 Need to get 70.5kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main fakeroot 1.2.10 [70.5kB]
-Fetched 70.5kB in 0s (569kB/s)
+Fetched 70.5kB in 0s (537kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11615 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.2.10_i386.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying source file
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -374,7 +374,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
@@ -409,11 +408,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 Aug 15 23:24:58 UTC 2005
+Tue Aug 16 22:55:42 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -483,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 Aug 15 23:25:03 UTC 2005
+Tue Aug 16 22:55:47 UTC 2005
 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
@@ -594,10 +593,10 @@ debian: warning: no utmp entry available and LOGNAME not defined; using uid of p
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
+/usr/lib/pbuilder/pbuilder-buildpackage: line 135: 29588 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting dev/pts filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 89: 16388 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Tue Aug 16 08:25:05 JST 2005
-pbuilder-time-stamp: 1124148305
+Current time: Wed Aug 17 07:55:49 JST 2005
+pbuilder-time-stamp: 1124232949
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/16105 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/29289 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index be7d1fa..7962f23 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 08:16:30 JST 2005
-pbuilder-time-stamp: 1124147790
+Current time: Wed Aug 17 07:47:31 JST 2005
+pbuilder-time-stamp: 1124232451
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -47,7 +47,7 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (1645kB/s)
+Fetched 2650kB in 1s (1500kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11461 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -95,16 +95,16 @@ After unpacking 193kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.4.2 [69.5kB]
-Fetched 69.5kB in 0s (579kB/s)
+Fetched 69.5kB in 0s (575kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12004 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.4.2_i386.deb) ...
 Setting up fakeroot (1.4.2) ...
 
 Copying source file
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -406,9 +406,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -420,7 +420,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 Aug 15 23:17:11 UTC 2005
+Tue Aug 16 22:48:31 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -490,13 +490,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 Aug 15 23:17:16 UTC 2005
+Tue Aug 16 22:48:36 UTC 2005
 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
+dsh: Process terminated (before write).
+a: a
 b: b
 PASS: tests/segv-catcher.sh
 l w
@@ -601,10 +601,10 @@ debian: warning: no utmp entry available and LOGNAME not defined; using uid of p
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
+/usr/lib/pbuilder/pbuilder-buildpackage: line 135: 27817 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting dev/pts filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 89: 14597 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Tue Aug 16 08:17:19 JST 2005
-pbuilder-time-stamp: 1124147839
+Current time: Wed Aug 17 07:48:39 JST 2005
+pbuilder-time-stamp: 1124232519
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/14311 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/27523 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index 38edecf..f583a6d 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -563,9 +563,9 @@ Refreshing the base.tgz
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
-Get:1 http://ftp.jp.debian.org etch/main Packages [3489kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3471kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [81B]
-Fetched 3489kB in 2s (1544kB/s)
+Fetched 3471kB in 2s (1592kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -610,7 +610,7 @@ Get:15 http://ftp.jp.debian.org etch/main libstdc++6-4.0-dev 4.0.1-2 [1516kB]
 Get:16 http://ftp.jp.debian.org etch/main g++-4.0 4.0.1-2 [2321kB]
 Get:17 http://ftp.jp.debian.org etch/main g++ 4:4.0.1-3 [1384B]
 Get:18 http://ftp.jp.debian.org etch/main build-essential 11.1 [6834B]
-Fetched 19.6MB in 8s (2200kB/s)
+Fetched 19.6MB in 10s (1815kB/s)
 Selecting previously deselected package binutils.
 (Reading database ... 7623 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1-2_i386.deb) ...
@@ -674,6 +674,6 @@ Setting up g++ (4.0.1-3) ...
 Setting up build-essential (11.1) ...
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//8018 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19684 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sarge.log b/testsuite/cdebootstrap/pbuilder-create-sarge.log
index c373331..9e8f806 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sarge.log
@@ -554,7 +554,7 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sarge/main Packages [3347kB]
 Get:2 http://ftp.jp.debian.org sarge/main Release [95B]
-Fetched 3347kB in 2s (1593kB/s)
+Fetched 3347kB in 2s (1534kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -595,7 +595,7 @@ Get:13 http://ftp.jp.debian.org sarge/main libstdc++5-3.3-dev 1:3.3.5-13 [775kB]
 Get:14 http://ftp.jp.debian.org sarge/main g++-3.3 1:3.3.5-13 [1779kB]
 Get:15 http://ftp.jp.debian.org sarge/main g++ 4:3.3.5-3 [1398B]
 Get:16 http://ftp.jp.debian.org sarge/main build-essential 10.1 [6520B]
-Fetched 17.7MB in 9s (1903kB/s)
+Fetched 17.7MB in 8s (2025kB/s)
 Selecting previously deselected package binutils.
 (Reading database ... 7617 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.15-6_i386.deb) ...
@@ -652,6 +652,6 @@ Setting up g++ (3.3.5-3) ...
 Setting up build-essential (10.1) ...
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31692 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12523 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index fae400e..cafddd0 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -581,8 +581,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 [34.1kB]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3756kB]
-Fetched 3791kB in 2s (1535kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3758kB]
+Fetched 3792kB in 2s (1471kB/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
@@ -629,7 +629,7 @@ Get:13 http://ftp.jp.debian.org sid/main libstdc++6-4.0-dev 4.0.1-4 [1517kB]
 Get:14 http://ftp.jp.debian.org sid/main g++-4.0 4.0.1-4 [2325kB]
 Get:15 http://ftp.jp.debian.org sid/main g++ 4:4.0.1-3 [1384B]
 Get:16 http://ftp.jp.debian.org sid/main build-essential 11.1 [6834B]
-Fetched 19.4MB in 13s (1484kB/s)
+Fetched 19.4MB in 9s (2006kB/s)
 Selecting previously deselected package binutils.
 (Reading database ... 7662 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1-2_i386.deb) ...
@@ -686,6 +686,6 @@ Setting up g++ (4.0.1-3) ...
 Setting up build-essential (11.1) ...
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31918 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13006 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index 5099944..506a133 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-etch.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//8944 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//22061 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sarge.log b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
index ffa9297..c9524f9 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//957 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14176 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index e715d3c..ab3104f 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sid.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31576 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12433 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 279507c..8daa8a1 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -18,7 +18,7 @@ Get:4 http://ftp.jp.debian.org ../project/experimental Release [21.6kB]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
 Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [163kB]
-Fetched 219kB in 0s (339kB/s)
+Fetched 219kB in 0s (411kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -40,7 +40,7 @@ Get:2 http://ftp.jp.debian.org ../project/experimental/main login 1:4.0.11.1-1 [
 Get:3 http://ftp.jp.debian.org ../project/experimental/main passwd 1:4.0.11.1-1 [518kB]
 Get:4 http://ftp.jp.debian.org ../project/experimental/main makedev 3.3.8.2-0 [92.2kB]
 Preconfiguring packages ...
-Fetched 1336kB in 0s (2123kB/s)
+Fetched 1336kB in 1s (1276kB/s)
 (Reading database ... 11472 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_i386.deb) ...
 Unpacking replacement diff ...
@@ -69,6 +69,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//10223 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23338 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 25e2ea6..a55af5d 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,9 +9,9 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org sid/main Packages [3756kB]
+Get:1 http://ftp.jp.debian.org sid/main Packages [3758kB]
 Get:2 http://ftp.jp.debian.org sid/main Release [82B]
-Fetched 3757kB in 2s (1590kB/s)
+Fetched 3758kB in 2s (1437kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -93,7 +93,7 @@ Get:58 http://ftp.jp.debian.org sid/main cpp-4.0 4.0.1-4 [2041kB]
 Get:59 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.2-3 [420kB]
 Get:60 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.2-3 [176kB]
 Preconfiguring packages ...
-Fetched 35.5MB in 16s (2210kB/s)
+Fetched 35.5MB in 18s (1868kB/s)
 (Reading database ... 11328 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-1.1_i386.deb) ...
 Unpacking replacement linux-kernel-headers ...
@@ -103,8 +103,8 @@ Preparing to replace libc6 2.3.2.ds1-22 (using .../libc6_2.3.5-3_i386.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-3) ...
 Current default timezone: 'UTC'.
-Local time is now:      Mon Aug 15 23:42:34 UTC 2005.
-Universal Time is now:  Mon Aug 15 23:42:34 UTC 2005.
+Local time is now:      Tue Aug 16 23:14:26 UTC 2005.
+Universal Time is now:  Tue Aug 16 23:14:26 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11434 files and directories currently installed.)
@@ -368,6 +368,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//9029 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//22150 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 f4c58e0..0df5178 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -18,7 +18,7 @@ Get:4 http://ftp.jp.debian.org ../project/experimental Release [21.6kB]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
 Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [163kB]
-Fetched 219kB in 0s (360kB/s)
+Fetched 219kB in 0s (428kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -40,7 +40,7 @@ Get:2 http://ftp.jp.debian.org ../project/experimental/main login 1:4.0.11.1-1 [
 Get:3 http://ftp.jp.debian.org ../project/experimental/main passwd 1:4.0.11.1-1 [518kB]
 Get:4 http://ftp.jp.debian.org ../project/experimental/main makedev 3.3.8.2-0 [92.2kB]
 Preconfiguring packages ...
-Fetched 1336kB in 0s (1733kB/s)
+Fetched 1336kB in 0s (1582kB/s)
 (Reading database ... 11872 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_i386.deb) ...
 Unpacking replacement diff ...
@@ -69,6 +69,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//7814 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19468 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
index 08c3811..bd368a4 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,9 +9,9 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org sid/main Packages [3756kB]
+Get:1 http://ftp.jp.debian.org sid/main Packages [3758kB]
 Get:2 http://ftp.jp.debian.org sid/main Release [82B]
-Fetched 3757kB in 3s (949kB/s)
+Fetched 3758kB in 3s (1144kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -100,7 +100,7 @@ Get:64 http://ftp.jp.debian.org sid/main cpp-4.0 4.0.1-4 [2041kB]
 Get:65 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.2-3 [420kB]
 Get:66 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.2-3 [176kB]
 Preconfiguring packages ...
-Fetched 41.3MB in 22s (1845kB/s)
+Fetched 41.3MB in 22s (1814kB/s)
 (Reading database ... 11722 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-1.1_i386.deb) ...
 Unpacking replacement linux-kernel-headers ...
@@ -110,8 +110,8 @@ Preparing to replace libc6 2.3.2.ds1-22 (using .../libc6_2.3.5-3_i386.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-3) ...
 Current default timezone: 'UTC'.
-Local time is now:      Mon Aug 15 23:31:05 UTC 2005.
-Universal Time is now:  Mon Aug 15 23:31:05 UTC 2005.
+Local time is now:      Tue Aug 16 23:02:18 UTC 2005.
+Universal Time is now:  Tue Aug 16 23:02:18 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11828 files and directories currently installed.)
@@ -399,6 +399,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//4876 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//18066 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
index 11e472c..92037c7 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
@@ -1,6 +1,6 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,9 +9,9 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3489kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3471kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [81B]
-Fetched 3489kB in 2s (1248kB/s)
+Fetched 3471kB in 2s (1189kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -113,7 +113,7 @@ Get:77 http://ftp.jp.debian.org etch/main fdutils 5.5-20050303-1 [347kB]
 Get:78 http://ftp.jp.debian.org etch/main psmisc 21.6-1 [58.9kB]
 Get:79 http://ftp.jp.debian.org etch/main setserial 2.17-41 [54.7kB]
 Preconfiguring packages ...
-Fetched 34.7MB in 18s (1848kB/s)
+Fetched 34.7MB in 19s (1803kB/s)
 (Reading database ... 11073 files and directories currently installed.)
 Preparing to replace base-passwd 3.5.9 (using .../base-passwd_3.5.10_i386.deb) ...
 Unpacking replacement base-passwd ...
@@ -500,6 +500,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//1045 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14264 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index 57e05b8..70738b3 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -1,10 +1,10 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2
+-> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
 Reading Package Lists...
@@ -22,7 +22,7 @@ Need to get 111kB of archives.
 After unpacking 643kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main debootstrap 0.3.1.4 [42.1kB]
 Get:2 http://ftp.jp.debian.org etch/main pbuilder 0.128 [68.6kB]
-Fetched 111kB in 0s (419kB/s)
+Fetched 111kB in 0s (469kB/s)
 Selecting previously deselected package debootstrap.
 (Reading database ... 11328 files and directories currently installed.)
 Unpacking debootstrap (from .../debootstrap_0.3.1.4_all.deb) ...
@@ -62,7 +62,7 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (2220kB/s)
+Fetched 2650kB in 1s (2116kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11407 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -108,7 +108,7 @@ The following NEW packages will be installed:
 Need to get 70.4kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.3 [70.4kB]
-Fetched 70.4kB in 0s (805kB/s)
+Fetched 70.4kB in 0s (681kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11950 files and directories currently installed.)
 Unpacking fakeroot (from .../archives/fakeroot_1.3_i386.deb) ...
@@ -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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -318,18 +318,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -342,26 +342,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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
@@ -398,9 +398,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -412,7 +412,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Mon Aug 15 23:40:58 UTC 2005
+Tue Aug 16 23:12:41 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,13 +482,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 Aug 15 23:41:03 UTC 2005
+Tue Aug 16 23:12:46 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-b: b
 dsh: Process terminated (before write).
+b: b
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -498,9 +498,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -508,58 +508,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -582,6 +582,6 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/3233 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/14888 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sarge.log b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
index 29cef8e..5020611 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sarge.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
@@ -1,10 +1,10 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2
+-> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
 Reading Package Lists...
@@ -22,7 +22,7 @@ Need to get 136kB of archives.
 After unpacking 586kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main debootstrap 0.2.45-0.2 [72.2kB]
 Get:2 http://ftp.jp.debian.org sarge/main pbuilder 0.123 [64.0kB]
-Fetched 136kB in 0s (740kB/s)
+Fetched 136kB in 0s (705kB/s)
 Selecting previously deselected package debootstrap.
 (Reading database ... 11073 files and directories currently installed.)
 Unpacking debootstrap (from .../debootstrap_0.2.45-0.2_i386.deb) ...
@@ -62,7 +62,7 @@ Get:7 http://ftp.jp.debian.org sarge/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sarge/main debhelper 4.2.32 [362kB]
 Get:9 http://ftp.jp.debian.org sarge/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2591kB in 1s (2314kB/s)
+Fetched 2591kB in 1s (1618kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11148 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -108,7 +108,7 @@ The following NEW packages will be installed:
 Need to get 70.5kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main fakeroot 1.2.10 [70.5kB]
-Fetched 70.5kB in 0s (809kB/s)
+Fetched 70.5kB in 0s (632kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11690 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.2.10_i386.deb) ...
@@ -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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -318,18 +318,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -342,26 +342,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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,8 +399,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -408,11 +408,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 Aug 15 23:26:41 UTC 2005
+Tue Aug 16 22:57:26 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,13 +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 Aug 15 23:26:46 UTC 2005
+Tue Aug 16 22:57:31 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-c: c
+dsh: Process terminated (before write).
 b: b
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -497,9 +498,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -507,58 +508,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -581,6 +582,6 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/27744 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/8517 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index 4cd66be..e4b99d9 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -1,10 +1,10 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2
+-> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
 Reading package lists...
@@ -24,7 +24,7 @@ WARNING: The following packages cannot be authenticated!
   debootstrap pbuilder
 Get:1 http://ftp.jp.debian.org sid/main debootstrap 0.3.1.5 [42.1kB]
 Get:2 http://ftp.jp.debian.org sid/main pbuilder 0.128 [68.6kB]
-Fetched 111kB in 0s (516kB/s)
+Fetched 111kB in 0s (538kB/s)
 Selecting previously deselected package debootstrap.
 (Reading database ... 11461 files and directories currently installed.)
 Unpacking debootstrap (from .../debootstrap_0.3.1.5_all.deb) ...
@@ -67,7 +67,7 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (2315kB/s)
+Fetched 2650kB in 1s (2031kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11540 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -115,7 +115,7 @@ After unpacking 193kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.4.2 [69.5kB]
-Fetched 69.5kB in 0s (794kB/s)
+Fetched 69.5kB in 0s (686kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12083 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.4.2_i386.deb) ...
@@ -130,14 +130,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -325,18 +325,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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; \
@@ -349,26 +349,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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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
@@ -380,7 +380,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
@@ -405,9 +404,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
@@ -419,7 +418,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 Aug 15 23:18:57 UTC 2005
+Tue Aug 16 22:50:25 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -489,13 +488,12 @@ 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 Aug 15 23:19:02 UTC 2005
+Tue Aug 16 22:50:30 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -505,9 +503,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -515,58 +513,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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -589,6 +587,6 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/25913 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/6761 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index 03b532c..097ac60 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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -29,10 +29,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 08:39:15 JST 2005
-pbuilder-time-stamp: 1124149155
+Current time: Wed Aug 17 08:10:52 JST 2005
+pbuilder-time-stamp: 1124233852
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -71,7 +71,7 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (2204kB/s)
+Fetched 2650kB in 1s (1803kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11328 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -441,11 +441,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 Aug 15 23:40:03 UTC 2005
+Tue Aug 16 23:11:36 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -515,13 +515,12 @@ 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 Aug 15 23:40:08 UTC 2005
+Tue Aug 16 23:11:41 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -627,9 +626,9 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
  -> unmounting dev/pts filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 89: 30236 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+/usr/lib/pbuilder/pbuilder-modules: line 89:  9492 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Tue Aug 16 08:40:10 JST 2005
-pbuilder-time-stamp: 1124149210
+Current time: Wed Aug 17 08:11:44 JST 2005
+pbuilder-time-stamp: 1124233904
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/29924 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/9206 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sarge.log b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
index fa5b59e..5aeb618 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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -29,10 +29,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 08:25:11 JST 2005
-pbuilder-time-stamp: 1124148311
+Current time: Wed Aug 17 07:55:55 JST 2005
+pbuilder-time-stamp: 1124232955
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -71,7 +71,7 @@ Get:7 http://ftp.jp.debian.org sarge/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sarge/main debhelper 4.2.32 [362kB]
 Get:9 http://ftp.jp.debian.org sarge/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2591kB in 1s (2214kB/s)
+Fetched 2591kB in 1s (1986kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11073 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -117,7 +117,7 @@ The following NEW packages will be installed:
 Need to get 70.5kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main fakeroot 1.2.10 [70.5kB]
-Fetched 70.5kB in 0s (718kB/s)
+Fetched 70.5kB in 0s (709kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11615 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.2.10_i386.deb) ...
@@ -404,7 +404,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
@@ -439,11 +438,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 Aug 15 23:25:51 UTC 2005
+Tue Aug 16 22:56:37 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -513,7 +512,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 Aug 15 23:25:56 UTC 2005
+Tue Aug 16 22:56:42 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -625,9 +624,9 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
  -> unmounting dev/pts filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 89: 22316 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+/usr/lib/pbuilder/pbuilder-modules: line 89:  3069 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Tue Aug 16 08:25:58 JST 2005
-pbuilder-time-stamp: 1124148358
+Current time: Wed Aug 17 07:56:44 JST 2005
+pbuilder-time-stamp: 1124233004
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/22033 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/2783 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index fb9db0a..5ef5866 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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -29,10 +29,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 08:17:24 JST 2005
-pbuilder-time-stamp: 1124147844
+Current time: Wed Aug 17 07:48:45 JST 2005
+pbuilder-time-stamp: 1124232525
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -74,7 +74,7 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (2094kB/s)
+Fetched 2650kB in 1s (2099kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11461 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -122,7 +122,7 @@ After unpacking 193kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.4.2 [69.5kB]
-Fetched 69.5kB in 0s (802kB/s)
+Fetched 69.5kB in 0s (697kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12004 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.4.2_i386.deb) ...
@@ -411,6 +411,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
@@ -434,10 +435,10 @@ success
 success
 success
 success
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -449,7 +450,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 Aug 15 23:18:06 UTC 2005
+Tue Aug 16 22:49:30 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -519,14 +520,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 Aug 15 23:18:11 UTC 2005
+Tue Aug 16 22:49:35 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
 c: c
 dsh: Process terminated (before write).
 a: a
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -631,9 +632,9 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
  -> unmounting dev/pts filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 89: 20513 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+/usr/lib/pbuilder/pbuilder-modules: line 89:  1268 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Tue Aug 16 08:18:13 JST 2005
-pbuilder-time-stamp: 1124147893
+Current time: Wed Aug 17 07:49:38 JST 2005
+pbuilder-time-stamp: 1124232578
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/20227 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/981 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index efa2d5a..86c87a7 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -2,12 +2,12 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 08:11:43 JST 2005
-pbuilder-time-stamp: 1124147503
+Current time: Wed Aug 17 07:43:20 JST 2005
+pbuilder-time-stamp: 1124232200
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
 
 gzip: stdin: unexpected end of file
 tar: Child returned status 1
 tar: Error exit delayed from previous errors
-E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/31585
+E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/12673
diff --git a/testsuite/normal/pbuilder-build-dsh-sarge.log b/testsuite/normal/pbuilder-build-dsh-sarge.log
index 7ead5a7..e30b5eb 100644
--- a/testsuite/normal/pbuilder-build-dsh-sarge.log
+++ b/testsuite/normal/pbuilder-build-dsh-sarge.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 08:01:38 JST 2005
-pbuilder-time-stamp: 1124146898
+Current time: Wed Aug 17 07:28:13 JST 2005
+pbuilder-time-stamp: 1124231293
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -44,7 +44,7 @@ Get:7 http://ftp.jp.debian.org sarge/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sarge/main debhelper 4.2.32 [362kB]
 Get:9 http://ftp.jp.debian.org sarge/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2591kB in 1s (1853kB/s)
+Fetched 2591kB in 1s (1990kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11040 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -90,16 +90,16 @@ The following NEW packages will be installed:
 Need to get 70.5kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main fakeroot 1.2.10 [70.5kB]
-Fetched 70.5kB in 0s (536kB/s)
+Fetched 70.5kB in 1s (52.3kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11582 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.2.10_i386.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying source file
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -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
-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 Aug 15 23:02:10 UTC 2005
+Tue Aug 16 22:29:36 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,14 +483,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 Aug 15 23:02:15 UTC 2005
+Tue Aug 16 22:29:42 UTC 2005
 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
@@ -593,10 +594,10 @@ debian: warning: no utmp entry available and LOGNAME not defined; using uid of p
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
+/usr/lib/pbuilder/pbuilder-buildpackage: line 135:  6073 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 89: 32735 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
-Current time: Tue Aug 16 08:02:18 JST 2005
-pbuilder-time-stamp: 1124146938
+Current time: Wed Aug 17 07:29:51 JST 2005
+pbuilder-time-stamp: 1124231391
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/32449 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/5463 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 8ed6b36..647c41e 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -2,12 +2,12 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 07:57:34 JST 2005
-pbuilder-time-stamp: 1124146654
+Current time: Wed Aug 17 07:23:08 JST 2005
+pbuilder-time-stamp: 1124230988
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
 
 gzip: stdin: unexpected end of file
 tar: Child returned status 1
 tar: Error exit delayed from previous errors
-E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir1/19905
+E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/23757
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index cc58185..638174d 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -73,4 +73,4 @@ W: Failure while configuring base packages.  This will be attempted 5 times.
 pbuilder: debootstrap failed
  -> Aborting with an error
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23528 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//3123 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sarge.log b/testsuite/normal/pbuilder-create-sarge.log
index f0d6e78..5c49c13 100644
--- a/testsuite/normal/pbuilder-create-sarge.log
+++ b/testsuite/normal/pbuilder-create-sarge.log
@@ -77,7 +77,7 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sarge/main Packages [3347kB]
 Get:2 http://ftp.jp.debian.org sarge/main Release [95B]
-Fetched 3347kB in 2s (1409kB/s)
+Fetched 3347kB in 2s (1278kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -118,7 +118,7 @@ Get:13 http://ftp.jp.debian.org sarge/main libstdc++5-3.3-dev 1:3.3.5-13 [775kB]
 Get:14 http://ftp.jp.debian.org sarge/main g++-3.3 1:3.3.5-13 [1779kB]
 Get:15 http://ftp.jp.debian.org sarge/main g++ 4:3.3.5-3 [1398B]
 Get:16 http://ftp.jp.debian.org sarge/main build-essential 10.1 [6520B]
-Fetched 17.7MB in 7s (2238kB/s)
+Fetched 17.7MB in 8s (1983kB/s)
 Selecting previously deselected package binutils.
 (Reading database ... 7584 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.15-6_i386.deb) ...
@@ -175,6 +175,6 @@ Setting up g++ (3.3.5-3) ...
 Setting up build-essential (10.1) ...
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//20218 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//25089 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 977b5f1..4080192 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -5,8 +5,315 @@ I: Retrieving Release
 I: Retrieving Packages
 I: Validating Packages
 I: Checking component main on http://ftp.jp.debian.org/debian...
-E: Couldn't find these debs: 35075854
-pbuilder: debootstrap failed
+I: Extracting base-files...
+I: Extracting base-passwd...
+I: Extracting bash...
+I: Extracting bsdutils...
+I: Extracting coreutils...
+I: Extracting debconf...
+I: Extracting debconf-i18n...
+I: Extracting debianutils...
+I: Extracting diff...
+I: Extracting dpkg...
+I: Extracting dselect...
+I: Extracting e2fslibs...
+I: Extracting e2fsprogs...
+I: Extracting findutils...
+I: Extracting gcc-3.3-base...
+I: Extracting grep...
+I: Extracting gzip...
+I: Extracting hostname...
+I: Extracting initscripts...
+I: Extracting libacl1...
+I: Extracting libattr1...
+I: Extracting libblkid1...
+I: Extracting libc6...
+I: Extracting libcap1...
+I: Extracting libcomerr2...
+I: Extracting libdb1-compat...
+I: Extracting libdb3...
+I: Extracting libgcc1...
+I: Extracting liblocale-gettext-perl...
+I: Extracting libncurses5...
+I: Extracting libnewt0.51...
+I: Extracting libpam-modules...
+I: Extracting libpam-runtime...
+I: Extracting libpam0g...
+I: Extracting libss2...
+I: Extracting libstdc++5...
+I: Extracting libtext-charwidth-perl...
+I: Extracting libtext-iconv-perl...
+I: Extracting libtext-wrapi18n-perl...
+I: Extracting libuuid1...
+I: Extracting login...
+I: Extracting makedev...
+I: Extracting mawk...
+I: Extracting mount...
+I: Extracting ncurses-base...
+I: Extracting ncurses-bin...
+I: Extracting passwd...
+I: Extracting perl-base...
+I: Extracting procps...
+I: Extracting sed...
+I: Extracting sysv-rc...
+I: Extracting sysvinit...
+I: Extracting tar...
+I: Extracting util-linux...
+I: Extracting zlib1g...
+I: Installing core packages...
+I: Unpacking required packages...
+I: Unpacking base-files...
+I: Unpacking base-passwd...
+I: Unpacking bash...
+I: Unpacking bsdutils...
+I: Unpacking coreutils...
+I: Unpacking debconf...
+I: Unpacking debconf-i18n...
+I: Unpacking debianutils...
+I: Unpacking diff...
+I: Unpacking dpkg...
+I: Unpacking dselect...
+I: Unpacking e2fslibs...
+I: Unpacking e2fsprogs...
+I: Unpacking findutils...
+I: Unpacking gcc-3.3-base...
+I: Unpacking grep...
+I: Unpacking gzip...
+I: Unpacking hostname...
+I: Unpacking initscripts...
+I: Unpacking libacl1...
+I: Unpacking libattr1...
+I: Unpacking libblkid1...
+I: Unpacking libc6...
+I: Unpacking libcap1...
+I: Unpacking libcomerr2...
+I: Unpacking libdb1-compat...
+I: Unpacking libdb3...
+I: Unpacking libgcc1...
+I: Unpacking liblocale-gettext-perl...
+I: Unpacking libncurses5...
+I: Unpacking libnewt0.51...
+I: Unpacking libpam-modules...
+I: Unpacking libpam-runtime...
+I: Unpacking libpam0g...
+I: Unpacking libss2...
+I: Unpacking libstdc++5...
+I: Unpacking libtext-charwidth-perl...
+I: Unpacking libtext-iconv-perl...
+I: Unpacking libtext-wrapi18n-perl...
+I: Unpacking libuuid1...
+I: Unpacking login...
+I: Unpacking makedev...
+I: Unpacking mawk...
+I: Unpacking mount...
+I: Unpacking ncurses-base...
+I: Unpacking ncurses-bin...
+I: Unpacking passwd...
+I: Unpacking perl-base...
+I: Unpacking procps...
+I: Unpacking sed...
+I: Unpacking sysv-rc...
+I: Unpacking sysvinit...
+I: Unpacking tar...
+I: Unpacking util-linux...
+I: Unpacking zlib1g...
+I: Configuring required packages...
+I: Configuring sysv-rc...
+I: Configuring libpam-runtime...
+I: Configuring libc6...
+I: Configuring gcc-3.3-base...
+I: Configuring libcap1...
+I: Configuring libdb1-compat...
+I: Configuring libuuid1...
+I: Configuring libpam0g...
+I: Configuring bsdutils...
+I: Configuring perl-base...
+I: Configuring tar...
+I: Configuring zlib1g...
+I: Configuring libgcc1...
+I: Configuring libtext-iconv-perl...
+I: Configuring libncurses5...
+I: Configuring libattr1...
+I: Configuring sed...
+I: Configuring e2fslibs...
+I: Configuring base-passwd...
+I: Configuring libcomerr2...
+I: Configuring mawk...
+I: Configuring grep...
+I: Configuring hostname...
+I: Configuring libacl1...
+I: Configuring libblkid1...
+I: Configuring libss2...
+I: Configuring findutils...
+I: Configuring e2fsprogs...
+I: Configuring liblocale-gettext-perl...
+I: Configuring diff...
+I: Configuring libdb3...
+I: Configuring libstdc++5...
+I: Configuring libtext-charwidth-perl...
+I: Configuring libtext-wrapi18n-perl...
+I: Configuring coreutils...
+I: Configuring debianutils...
+I: Configuring makedev...
+I: Configuring procps...
+I: Configuring ncurses-base...
+I: Configuring ncurses-bin...
+I: Configuring libpam-modules...
+I: Configuring base-files...
+I: Configuring mount...
+I: Configuring gzip...
+I: Configuring dpkg...
+I: Configuring dselect...
+I: Configuring login...
+I: Configuring passwd...
+I: Configuring bash...
+I: Configuring debconf-i18n...
+I: Configuring debconf...
+I: Configuring util-linux...
+I: Configuring libnewt0.51...
+I: Configuring initscripts...
+I: Configuring sysvinit...
+I: Unpacking the base system...
+I: Unpacking adduser...
+I: Unpacking apt...
+I: Unpacking apt-utils...
+I: Unpacking aptitude...
+I: Unpacking base-config...
+I: Unpacking bsdmainutils...
+I: Unpacking console-common...
+I: Unpacking console-data...
+I: Unpacking console-tools...
+I: Unpacking cpio...
+I: Unpacking cron...
+I: Unpacking dhcp-client...
+I: Unpacking dmidecode...
+I: Unpacking ed...
+I: Unpacking gettext-base...
+I: Unpacking gnupg...
+I: Unpacking groff-base...
+I: Unpacking ifupdown...
+I: Unpacking info...
+I: Unpacking iptables...
+I: Unpacking iputils-ping...
+I: Unpacking klogd...
+I: Unpacking laptop-detect...
+I: Unpacking libbz2-1.0...
+I: Unpacking libconsole...
+I: Unpacking libdb4.2...
+I: Unpacking libgcrypt11...
+I: Unpacking libgdbm3...
+I: Unpacking libgnutls11...
+I: Unpacking libgnutls12...
+I: Unpacking libgpg-error0...
+I: Unpacking libldap2...
+I: Unpacking liblockfile1...
+I: Unpacking liblzo1...
+I: Unpacking libncursesw5...
+I: Unpacking libopencdk8...
+I: Unpacking libpcre3...
+I: Unpacking libpopt0...
+I: Unpacking libreadline5...
+I: Unpacking libsasl2...
+I: Unpacking libslang2...
+I: Unpacking libssl0.9.7...
+I: Unpacking libtasn1-2...
+I: Unpacking libtextwrap1...
+I: Unpacking libusb-0.1-4...
+I: Unpacking libwrap0...
+I: Unpacking logrotate...
+I: Unpacking lsb-base...
+I: Unpacking man-db...
+I: Unpacking manpages...
+I: Unpacking module-init-tools...
+I: Unpacking modutils...
+I: Unpacking nano...
+I: Unpacking net-tools...
+I: Unpacking netbase...
+I: Unpacking netcat...
+I: Unpacking netkit-inetd...
+I: Unpacking nvi...
+I: Unpacking sysklogd...
+I: Unpacking tasksel...
+I: Unpacking tcpd...
+I: Unpacking traceroute...
+I: Unpacking wget...
+I: Unpacking whiptail...
+I: Configuring the base system...
+I: Configuring gettext-base...
+I: Configuring libgdbm3...
+I: Configuring libtasn1-2...
+I: Configuring lsb-base...
+I: Configuring libpopt0...
+I: Configuring libusb-0.1-4...
+I: Configuring libgpg-error0...
+I: Configuring libssl0.9.7...
+I: Configuring dmidecode...
+I: Configuring dhcp-client...
+I: Configuring adduser...
+I: Configuring modutils...
+I: Configuring traceroute...
+I: Configuring manpages...
+I: Configuring ed...
+I: Configuring libreadline5...
+I: Configuring liblzo1...
+I: Configuring wget...
+I: Configuring groff-base...
+I: Configuring libdb4.2...
+I: Configuring net-tools...
+I: Configuring bsdmainutils...
+I: Configuring libslang2...
+I: Configuring libpcre3...
+I: Configuring libncursesw5...
+I: Configuring info...
+I: Configuring iputils-ping...
+I: Configuring libbz2-1.0...
+I: Configuring cron...
+I: Configuring libsasl2...
+I: Configuring nano...
+I: Configuring netkit-inetd...
+I: Configuring libconsole...
+I: Configuring iptables...
+I: Configuring cpio...
+I: Configuring nvi...
+I: Configuring libwrap0...
+I: Configuring netcat...
+I: Configuring liblockfile1...
+I: Configuring tcpd...
+I: Configuring laptop-detect...
+I: Configuring module-init-tools...
+I: Configuring man-db...
+I: Configuring libgcrypt11...
+I: Configuring whiptail...
+I: Configuring ifupdown...
+I: Configuring libopencdk8...
+I: Configuring libgnutls12...
+I: Configuring libgnutls11...
+I: Configuring libldap2...
+I: Configuring netbase...
+I: Configuring gnupg...
+I: Configuring libtextwrap1...
+I: Configuring console-data...
+I: Configuring sysklogd...
+I: Configuring klogd...
+I: Configuring console-tools...
+I: Configuring console-common...
+W: Failure while configuring base packages.  This will be attempted 5 times.
+W: Failure while configuring base packages.  This will be attempted 5 times.
+W: Failure while configuring base packages.  This will be attempted 5 times.
+W: Failure while configuring base packages.  This will be attempted 5 times.
+W: Failure while configuring base packages.  This will be attempted 5 times.
+I: Base system installed successfully.
+ -> debootstrap finished
+ -> copying local configuration
+  -> Installing apt-lines
+Refreshing the base.tgz 
+ -> upgrading packages
+ -> mounting /proc filesystem
+ -> mounting /dev/pts filesystem
+ -> installing dummy policy-rc.d
+/usr/bin/apt-get: error while loading shared libraries: libstdc++.so.6: cannot open shared object file: No such file or directory
  -> Aborting with an error
+ -> unmounting dev/pts filesystem
+ -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//19639 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//11979 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 4aaca18..df11d4e 100644
--- a/testsuite/normal/pbuilder-execute-etch.log
+++ b/testsuite/normal/pbuilder-execute-etch.log
@@ -1,7 +1,7 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
 
 gzip: stdin: unexpected end of file
 tar: Child returned status 1
 tar: Error exit delayed from previous errors
-E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage to /var/cache/pbuilder/build//31885
+E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage to /var/cache/pbuilder/build//12973
diff --git a/testsuite/normal/pbuilder-execute-sarge.log b/testsuite/normal/pbuilder-execute-sarge.log
index b6c2f8f..23f9a27 100644
--- a/testsuite/normal/pbuilder-execute-sarge.log
+++ b/testsuite/normal/pbuilder-execute-sarge.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//17260 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26680 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index 4e55a0f..621bdff 100644
--- a/testsuite/normal/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
@@ -1,7 +1,7 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
 
 gzip: stdin: unexpected end of file
 tar: Child returned status 1
 tar: Error exit delayed from previous errors
-E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage to /var/cache/pbuilder/build//20205
+E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage to /var/cache/pbuilder/build//25076
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index 169ff8d..01096c0 100644
--- a/testsuite/normal/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
@@ -1,8 +1,8 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
 
 gzip: stdin: unexpected end of file
 tar: Child returned status 1
 tar: Error exit delayed from previous errors
-E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage to /var/cache/pbuilder/build//31905
+E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage to /var/cache/pbuilder/build//12993
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index c780bdf..4ecb5c2 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,8 +1,8 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
 
 gzip: stdin: unexpected end of file
 tar: Child returned status 1
 tar: Error exit delayed from previous errors
-E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage to /var/cache/pbuilder/build//31895
+E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage to /var/cache/pbuilder/build//12983
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
index 916f033..29ce829 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -18,7 +18,7 @@ Get:4 http://ftp.jp.debian.org ../project/experimental Release [21.6kB]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
 Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [163kB]
-Fetched 219kB in 0s (641kB/s)
+Fetched 219kB in 0s (322kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -40,7 +40,7 @@ Get:2 http://ftp.jp.debian.org ../project/experimental/main login 1:4.0.11.1-1 [
 Get:3 http://ftp.jp.debian.org ../project/experimental/main passwd 1:4.0.11.1-1 [518kB]
 Get:4 http://ftp.jp.debian.org ../project/experimental/main makedev 3.3.8.2-0 [92.2kB]
 Preconfiguring packages ...
-Fetched 1336kB in 1s (1300kB/s)
+Fetched 1336kB in 0s (1551kB/s)
 (Reading database ... 11839 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_i386.deb) ...
 Unpacking replacement diff ...
@@ -69,6 +69,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23335 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//2921 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid.log b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
index f9d02fd..4ba4a62 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,9 +9,9 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org sid/main Packages [3756kB]
+Get:1 http://ftp.jp.debian.org sid/main Packages [3758kB]
 Get:2 http://ftp.jp.debian.org sid/main Release [82B]
-Fetched 3757kB in 2s (1316kB/s)
+Fetched 3758kB in 3s (1244kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -97,7 +97,7 @@ Get:62 http://ftp.jp.debian.org sid/main g++-4.0 4.0.1-4 [2325kB]
 Get:63 http://ftp.jp.debian.org sid/main cpp-4.0 4.0.1-4 [2041kB]
 Get:64 http://ftp.jp.debian.org sid/main ipchains 1.3.10-16 [76.6kB]
 Preconfiguring packages ...
-Fetched 40.7MB in 19s (2042kB/s)
+Fetched 40.7MB in 22s (1789kB/s)
 (Reading database ... 11689 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-1.1_i386.deb) ...
 Unpacking replacement linux-kernel-headers ...
@@ -107,8 +107,8 @@ Preparing to replace libc6 2.3.2.ds1-22 (using .../libc6_2.3.5-3_i386.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-3) ...
 Current default timezone: 'UTC'.
-Local time is now:      Mon Aug 15 23:07:01 UTC 2005.
-Universal Time is now:  Mon Aug 15 23:07:01 UTC 2005.
+Local time is now:      Tue Aug 16 22:38:23 UTC 2005.
+Universal Time is now:  Tue Aug 16 22:38:23 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11795 files and directories currently installed.)
@@ -387,6 +387,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//20574 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//32583 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch.log b/testsuite/normal/pbuilder-update-sarge-etch.log
index d2d7607..7db4d42 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch.log
@@ -1,6 +1,6 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,9 +9,9 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3489kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3471kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [81B]
-Fetched 3489kB in 2s (1511kB/s)
+Fetched 3471kB in 2s (1478kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -113,7 +113,7 @@ Get:77 http://ftp.jp.debian.org etch/main build-essential 11.1 [6834B]
 Get:78 http://ftp.jp.debian.org etch/main fdutils 5.5-20050303-1 [347kB]
 Get:79 http://ftp.jp.debian.org etch/main psmisc 21.6-1 [58.9kB]
 Preconfiguring packages ...
-Fetched 34.8MB in 14s (2362kB/s)
+Fetched 34.8MB in 20s (1686kB/s)
 (Reading database ... 11040 files and directories currently installed.)
 Preparing to replace base-passwd 3.5.9 (using .../base-passwd_3.5.10_i386.deb) ...
 Unpacking replacement base-passwd ...
@@ -494,6 +494,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//17334 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//27157 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index a4b3466..6f21a1f 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -1,7 +1,7 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
 
 gzip: stdin: unexpected end of file
 tar: Child returned status 1
 tar: Error exit delayed from previous errors
-E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/31876
+E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/12964
diff --git a/testsuite/normal/pdebuild-internal-sarge.log b/testsuite/normal/pdebuild-internal-sarge.log
index f9bc5ec..36d141b 100644
--- a/testsuite/normal/pdebuild-internal-sarge.log
+++ b/testsuite/normal/pdebuild-internal-sarge.log
@@ -1,10 +1,10 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2
+-> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
 Reading Package Lists...
@@ -22,7 +22,7 @@ Need to get 136kB of archives.
 After unpacking 586kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main debootstrap 0.2.45-0.2 [72.2kB]
 Get:2 http://ftp.jp.debian.org sarge/main pbuilder 0.123 [64.0kB]
-Fetched 136kB in 0s (736kB/s)
+Fetched 136kB in 0s (751kB/s)
 Selecting previously deselected package debootstrap.
 (Reading database ... 11040 files and directories currently installed.)
 Unpacking debootstrap (from .../debootstrap_0.2.45-0.2_i386.deb) ...
@@ -62,7 +62,7 @@ Get:7 http://ftp.jp.debian.org sarge/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sarge/main debhelper 4.2.32 [362kB]
 Get:9 http://ftp.jp.debian.org sarge/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2591kB in 1s (2117kB/s)
+Fetched 2591kB in 1s (2148kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11115 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -108,7 +108,7 @@ The following NEW packages will be installed:
 Need to get 70.5kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main fakeroot 1.2.10 [70.5kB]
-Fetched 70.5kB in 0s (735kB/s)
+Fetched 70.5kB in 0s (697kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11657 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.2.10_i386.deb) ...
@@ -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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -318,18 +318,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -342,26 +342,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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,8 +399,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -412,7 +412,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Mon Aug 15 23:03:32 UTC 2005
+Tue Aug 16 22:33:30 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,14 +482,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Mon Aug 15 23:03:37 UTC 2005
+Tue Aug 16 22:33:35 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
+b: b
 dsh: Process terminated (before write).
+a: a
 c: c
-b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -498,9 +498,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -508,58 +508,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -582,6 +582,6 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/11621 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/19747 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index ecada96..fed88aa 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -1,7 +1,7 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
 
 gzip: stdin: unexpected end of file
 tar: Child returned status 1
 tar: Error exit delayed from previous errors
-E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/20196
+E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/24997
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 52a471f..705bdb6 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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -29,12 +29,12 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 08:11:46 JST 2005
-pbuilder-time-stamp: 1124147506
+Current time: Wed Aug 17 07:43:23 JST 2005
+pbuilder-time-stamp: 1124232203
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
 
 gzip: stdin: unexpected end of file
 tar: Child returned status 1
 tar: Error exit delayed from previous errors
-E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/31845
+E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/12933
diff --git a/testsuite/normal/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index f7d2e13..372cd25 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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -29,10 +29,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 08:02:22 JST 2005
-pbuilder-time-stamp: 1124146942
+Current time: Wed Aug 17 07:29:59 JST 2005
+pbuilder-time-stamp: 1124231399
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -71,7 +71,7 @@ Get:7 http://ftp.jp.debian.org sarge/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sarge/main debhelper 4.2.32 [362kB]
 Get:9 http://ftp.jp.debian.org sarge/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2591kB in 1s (2283kB/s)
+Fetched 2591kB in 1s (1767kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11040 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -117,7 +117,7 @@ The following NEW packages will be installed:
 Need to get 70.5kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main fakeroot 1.2.10 [70.5kB]
-Fetched 70.5kB in 0s (812kB/s)
+Fetched 70.5kB in 0s (691kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11582 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.2.10_i386.deb) ...
@@ -443,7 +443,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 Aug 15 23:02:52 UTC 2005
+Tue Aug 16 22:31:30 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -513,14 +513,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 Aug 15 23:02:57 UTC 2005
+Tue Aug 16 22:31:35 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
+b: b
 dsh: Process terminated (before write).
 c: c
-b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -625,9 +625,9 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
  -> unmounting dev/pts filesystem
+/usr/lib/pbuilder/pbuilder-modules: line 89: 13405 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-/usr/lib/pbuilder/pbuilder-buildpackage: line 152:  6245 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
-Current time: Tue Aug 16 08:03:00 JST 2005
-pbuilder-time-stamp: 1124146980
+Current time: Wed Aug 17 07:31:45 JST 2005
+pbuilder-time-stamp: 1124231505
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/5959 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/12772 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 7f59c6e..ccc67c7 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/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -29,12 +29,12 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Tue Aug 16 07:57:37 JST 2005
-pbuilder-time-stamp: 1124146657
+Current time: Wed Aug 17 07:23:18 JST 2005
+pbuilder-time-stamp: 1124230998
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
 
 gzip: stdin: unexpected end of file
 tar: Child returned status 1
 tar: Error exit delayed from previous errors
-E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.ExPwZA/dir2/20165
+E: failed to extract /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage to /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/24905