still successful cdebootstrap and failing debootstra

20 files changed, 646 insertions, 608 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index da816a6..8932660 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -1,10 +1,10 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Oct 15 12:19:14 JST 2005
-pbuilder-time-stamp: 1129346354
+Current time: Mon Oct 17 12:18:59 JST 2005
+pbuilder-time-stamp: 1129519139
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -72,11 +72,11 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/22250/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/2872/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -379,8 +379,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: 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
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -388,11 +388,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
-Sat Oct 15 03:19:54 UTC 2005
+Mon Oct 17 03:19:27 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
@@ -462,14 +462,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Oct 15 03:19:59 UTC 2005
+Mon Oct 17 03:19:32 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).
 b: b
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -575,7 +575,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Oct 15 12:20:01 JST 2005
-pbuilder-time-stamp: 1129346401
+Current time: Mon Oct 17 12:19:34 JST 2005
+pbuilder-time-stamp: 1129519174
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/22250 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/2872 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
index d5fcbec..9aaa022 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
@@ -1,10 +1,10 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Oct 15 12:10:15 JST 2005
-pbuilder-time-stamp: 1129345815
+Current time: Mon Oct 17 12:11:22 JST 2005
+pbuilder-time-stamp: 1129518682
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -72,11 +72,11 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/10995/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/24366/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -351,6 +351,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
@@ -389,7 +390,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Oct 15 03:10:48 UTC 2005
+Mon Oct 17 03:12:10 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
@@ -402,18 +403,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -428,6 +417,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -459,14 +460,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Oct 15 03:10:53 UTC 2005
+Mon Oct 17 03:12:15 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -572,7 +573,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Oct 15 12:10:55 JST 2005
-pbuilder-time-stamp: 1129345855
+Current time: Mon Oct 17 12:12:17 JST 2005
+pbuilder-time-stamp: 1129518737
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/10995 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/24366 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 1100783..fe70c43 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -1,10 +1,10 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Oct 15 12:05:23 JST 2005
-pbuilder-time-stamp: 1129345523
+Current time: Mon Oct 17 12:05:05 JST 2005
+pbuilder-time-stamp: 1129518305
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -32,14 +32,11 @@ The following NEW packages will be installed:
   debconf-utils debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 293kB/2890kB of archives.
+Need to get 0B/2890kB of archives.
 After unpacking 9572kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
-Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.15-2 [262kB]
-Get:2 http://ftp.jp.debian.org sid/main file 4.15-2 [30.8kB]
-Fetched 293kB in 0s (606kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11516 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
@@ -78,13 +75,11 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
- -> new cache content libmagic1_4.15-2_amd64.deb added
- -> new cache content file_4.15-2_amd64.deb added
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/7647/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/16277/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -396,11 +391,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
-Sat Oct 15 03:06:02 UTC 2005
+Mon Oct 17 03:05:39 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
@@ -470,13 +465,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
-Sat Oct 15 03:06:07 UTC 2005
+Mon Oct 17 03:05:44 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
@@ -583,7 +578,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Oct 15 12:06:09 JST 2005
-pbuilder-time-stamp: 1129345569
+Current time: Mon Oct 17 12:05:46 JST 2005
+pbuilder-time-stamp: 1129518346
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/7647 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir1/16277 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index e7ac9e2..9de4be8 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -308,7 +308,8 @@ P: Extracting bash
 P: Extracting findutils
 P: Extracting makedev
 O: Selecting previously deselected package base-passwd.
-O: (Reading database ... 0 files and directories currently installed.)
+O: (Reading database ... 
+O: 0 files and directories currently installed.)
 O: Unpacking base-passwd (from .../base-passwd_3.5.10_amd64.deb) ...
 P: Unpacking package base-passwd
 O: dpkg: base-passwd: dependency problems, but configuring anyway as you request:
@@ -861,7 +862,8 @@ O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by c
 O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
-O: (Reading database ... 4519 files and directories currently installed.)
+O: (Reading database ... 
+O: 4519 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
@@ -907,7 +909,7 @@ O:   libwrap0 logrotate man-db manpages nano net-tools netbase netkit-inetd nvi
 O:   psmisc sysklogd tasksel tcpd telnet wget whiptail
 O: 0 upgraded, 57 newly installed, 0 to remove and 0 not upgraded.
 O: Need to get 14.4MB of archives.
-O: After unpacking 45.0MB of additional disk space will be used.
+O: After unpacking 45.1MB of additional disk space will be used.
 O: Selecting previously deselected package console-data.
 O: (Reading database ... 
 O: 4701 files and directories currently installed.)
@@ -1055,19 +1057,19 @@ O: Selecting previously deselected package whiptail.
 O: Unpacking whiptail (from .../whiptail_0.51.6-31_amd64.deb) ...
 P: Unpacking package whiptail
 O: Selecting previously deselected package exim4-config.
-O: Unpacking exim4-config (from .../exim4-config_4.52-2_all.deb) ...
+O: Unpacking exim4-config (from .../exim4-config_4.54-1_all.deb) ...
 P: Unpacking package exim4-config
 O: Selecting previously deselected package exim4-base.
-O: Unpacking exim4-base (from .../exim4-base_4.52-2_amd64.deb) ...
+O: Unpacking exim4-base (from .../exim4-base_4.54-1_amd64.deb) ...
 P: Unpacking package exim4-base
 O: Selecting previously deselected package exim4-daemon-light.
-O: Unpacking exim4-daemon-light (from .../exim4-daemon-light_4.52-2_amd64.deb) ...
+O: Unpacking exim4-daemon-light (from .../exim4-daemon-light_4.54-1_amd64.deb) ...
 P: Unpacking package exim4-daemon-light
 O: Selecting previously deselected package at.
 O: Unpacking at (from .../bootstrap/at_3.1.9_amd64.deb) ...
 P: Unpacking package at
 O: Selecting previously deselected package exim4.
-O: Unpacking exim4 (from .../bootstrap/exim4_4.52-2_all.deb) ...
+O: Unpacking exim4 (from .../bootstrap/exim4_4.54-1_all.deb) ...
 P: Unpacking package exim4
 O: Selecting previously deselected package telnet.
 O: Unpacking telnet (from .../telnet_0.17-31_amd64.deb) ...
@@ -1210,7 +1212,7 @@ P: Configuring package wget
 O: 
 O: Setting up whiptail (0.51.6-31) ...
 P: Configuring package whiptail
-O: Setting up exim4-config (4.52-2) ...
+O: Setting up exim4-config (4.54-1) ...
 P: Configuring package exim4-config
 O: hostname: 
 O: Host name lookup failure
@@ -1221,16 +1223,16 @@ O:
 O: Adding system-user for exim (v4)
 O: chage: the shadow password file is not present
 O: 
-O: Setting up exim4-base (4.52-2) ...
+O: Setting up exim4-base (4.54-1) ...
 P: Configuring package exim4-base
 O: 
-O: Setting up exim4-daemon-light (4.52-2) ...
+O: Setting up exim4-daemon-light (4.54-1) ...
 P: Configuring package exim4-daemon-light
 O: 
 O: Setting up at (3.1.9) ...
 P: Configuring package at
 O: 
-O: Setting up exim4 (4.52-2) ...
+O: Setting up exim4 (4.54-1) ...
 P: Configuring package exim4
 O: Setting up telnet (0.17-31) ...
 P: Configuring package telnet
@@ -1292,9 +1294,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 [3365kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3355kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3365kB in 1s (1887kB/s)
+Fetched 3355kB in 1s (1858kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -1378,6 +1380,6 @@ Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//6727 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19789 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sarge.log b/testsuite/cdebootstrap/pbuilder-create-sarge.log
index 75bb081..01faddb 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sarge.log
@@ -285,9 +285,6 @@ P: Extracting bash
 P: Extracting findutils
 P: Extracting makedev
 O: Selecting previously deselected package dpkg.
-O: (Reading database ... 0 files and directories currently installed.)
-O: Unpacking dpkg (from .../dpkg_1.10.28_amd64.deb) ...
-P: Unpacking package dpkg
 O: dpkg: regarding .../dpkg_1.10.28_amd64.deb containing dpkg, pre-dependency problem:
 O:  dpkg pre-depends on dselect
 O:   dselect is not installed.
@@ -295,6 +292,10 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: dpkg: regarding .../dpkg_1.10.28_amd64.deb containing dpkg, pre-dependency problem:
 O:  dpkg pre-depends on libc6 (>= 2.3.2.ds1-21)
 O: dpkg: warning - ignoring pre-dependency problem !
+O: (Reading database ... 
+O: 0 files and directories currently installed.)
+O: Unpacking dpkg (from .../dpkg_1.10.28_amd64.deb) ...
+P: Unpacking package dpkg
 O: dpkg: dpkg: dependency problems, but configuring anyway as you request:
 O:  dpkg depends on dselect; however:
 O:   Package dselect is not installed.
@@ -772,12 +773,14 @@ O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by c
 O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
-O: (Reading database ... 4198 files and directories currently installed.)
+O: (Reading database ... 
+O: 4198 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package apt.
-O: (Reading database ... 4198 files and directories currently installed.)
+O: (Reading database ... 
+O: 4198 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.5.28.6_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.5.28.6) ...
@@ -1215,7 +1218,7 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sarge/main Packages [3223kB]
 Get:2 http://ftp.jp.debian.org sarge/main Release [110B]
-Fetched 3223kB in 1s (1943kB/s)
+Fetched 3223kB in 2s (1111kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -1298,6 +1301,6 @@ Setting up build-essential (10.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//27160 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//3428 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index 3594975..7ea963a 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -21,20 +21,6 @@ P: Retrieving libdb4.2
 P: Validating libdb4.2
 P: Retrieving apt-utils
 P: Validating apt-utils
-P: Retrieving perl-base
-P: Validating perl-base
-P: Retrieving liblocale-gettext-perl
-P: Validating liblocale-gettext-perl
-P: Retrieving libtext-iconv-perl
-P: Validating libtext-iconv-perl
-P: Retrieving libtext-charwidth-perl
-P: Validating libtext-charwidth-perl
-P: Retrieving libtext-wrapi18n-perl
-P: Validating libtext-wrapi18n-perl
-P: Retrieving debconf-i18n
-P: Validating debconf-i18n
-P: Retrieving debconf
-P: Validating debconf
 P: Retrieving libattr1
 P: Validating libattr1
 P: Retrieving libacl1
@@ -49,6 +35,20 @@ P: Retrieving dhcp3-client
 P: Validating dhcp3-client
 P: Retrieving net-tools
 P: Validating net-tools
+P: Retrieving perl-base
+P: Validating perl-base
+P: Retrieving liblocale-gettext-perl
+P: Validating liblocale-gettext-perl
+P: Retrieving libtext-iconv-perl
+P: Validating libtext-iconv-perl
+P: Retrieving libtext-charwidth-perl
+P: Validating libtext-charwidth-perl
+P: Retrieving libtext-wrapi18n-perl
+P: Validating libtext-wrapi18n-perl
+P: Retrieving debconf-i18n
+P: Validating debconf-i18n
+P: Retrieving debconf
+P: Validating debconf
 P: Retrieving ifupdown
 P: Validating ifupdown
 P: Retrieving iptables
@@ -245,6 +245,10 @@ P: Extracting libc6
 P: Extracting libgcc1
 P: Extracting gcc-4.0-base
 P: Extracting libstdc++6
+P: Extracting libattr1
+P: Extracting libacl1
+P: Extracting coreutils
+P: Extracting debianutils
 P: Extracting perl-base
 P: Extracting liblocale-gettext-perl
 P: Extracting libtext-iconv-perl
@@ -252,10 +256,6 @@ P: Extracting libtext-charwidth-perl
 P: Extracting libtext-wrapi18n-perl
 P: Extracting debconf
 P: Extracting debconf-i18n
-P: Extracting libattr1
-P: Extracting libacl1
-P: Extracting coreutils
-P: Extracting debianutils
 P: Extracting sed
 P: Extracting libncurses5
 P: Extracting ncurses-bin
@@ -311,13 +311,12 @@ O: Setting up base-passwd (3.5.10) ...
 P: Configuring package base-passwd
 O: 
 O: Selecting previously deselected package dpkg.
+O: (Reading database ... 21 files and directories currently installed.)
+O: Unpacking dpkg (from .../dpkg_1.13.11_amd64.deb) ...
+P: Unpacking package dpkg
 O: dpkg: regarding .../dpkg_1.13.11_amd64.deb containing dpkg, pre-dependency problem:
 O:  dpkg pre-depends on libc6 (>= 2.3.5-1)
 O: dpkg: warning - ignoring pre-dependency problem !
-O: (Reading database ... 
-O: 21 files and directories currently installed.)
-O: Unpacking dpkg (from .../dpkg_1.13.11_amd64.deb) ...
-P: Unpacking package dpkg
 O: dpkg: dpkg: dependency problems, but configuring anyway as you request:
 O:  dpkg depends on libc6 (>= 2.3.5-1); however:
 O:   Package libc6 is not installed.
@@ -332,7 +331,7 @@ O:
 O: Selecting previously deselected package libc6.
 O: (Reading database ... 
 O: 224 files and directories currently installed.)
-O: Unpacking libc6 (from .../libc6_2.3.5-6_amd64.deb) ...
+O: Unpacking libc6 (from .../libc6_2.3.5-7_amd64.deb) ...
 P: Unpacking package libc6
 O: Selecting previously deselected package libgcc1.
 O: Unpacking libgcc1 (from .../libgcc1_4.0.2-2_amd64.deb) ...
@@ -343,6 +342,34 @@ P: Unpacking package gcc-4.0-base
 O: Selecting previously deselected package libstdc++6.
 O: Unpacking libstdc++6 (from .../libstdc++6_4.0.2-2_amd64.deb) ...
 P: Unpacking package libstdc++6
+O: Selecting previously deselected package libattr1.
+O: Unpacking libattr1 (from .../libattr1_2.4.25-1_amd64.deb) ...
+P: Unpacking package libattr1
+O: Selecting previously deselected package libacl1.
+O: Unpacking libacl1 (from .../libacl1_2.2.32-1_amd64.deb) ...
+P: Unpacking package libacl1
+O: Selecting previously deselected package coreutils.
+O: dpkg: regarding .../coreutils_5.2.1-2.1_amd64.deb containing coreutils, pre-dependency problem:
+O:  coreutils pre-depends on libacl1 (>= 2.2.11-1)
+O:   libacl1 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: dpkg: regarding .../coreutils_5.2.1-2.1_amd64.deb containing coreutils, pre-dependency problem:
+O:  coreutils pre-depends on libc6 (>= 2.3.5-1)
+O:   libc6 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: Unpacking coreutils (from .../coreutils_5.2.1-2.1_amd64.deb) ...
+P: Unpacking package coreutils
+O: Selecting previously deselected package debianutils.
+O: dpkg: regarding .../debianutils_2.15_amd64.deb containing debianutils, pre-dependency problem:
+O:  debianutils pre-depends on libc6 (>= 2.3.5-1)
+O:   libc6 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: dpkg: regarding .../debianutils_2.15_amd64.deb containing debianutils, pre-dependency problem:
+O:  debianutils pre-depends on coreutils (>= 4.5.8-1)
+O:   coreutils is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: Unpacking debianutils (from .../debianutils_2.15_amd64.deb) ...
+P: Unpacking package debianutils
 O: Selecting previously deselected package perl-base.
 O: dpkg: regarding .../perl-base_5.8.7-6_amd64.deb containing perl-base, pre-dependency problem:
 O:  perl-base pre-depends on libc6 (>= 2.3.5-1)
@@ -380,34 +407,6 @@ P: Unpacking package debconf
 O: Selecting previously deselected package debconf-i18n.
 O: Unpacking debconf-i18n (from .../debconf-i18n_1.4.58_all.deb) ...
 P: Unpacking package debconf-i18n
-O: Selecting previously deselected package libattr1.
-O: Unpacking libattr1 (from .../libattr1_2.4.25-1_amd64.deb) ...
-P: Unpacking package libattr1
-O: Selecting previously deselected package libacl1.
-O: Unpacking libacl1 (from .../libacl1_2.2.32-1_amd64.deb) ...
-P: Unpacking package libacl1
-O: Selecting previously deselected package coreutils.
-O: dpkg: regarding .../coreutils_5.2.1-2.1_amd64.deb containing coreutils, pre-dependency problem:
-O:  coreutils pre-depends on libacl1 (>= 2.2.11-1)
-O:   libacl1 is unpacked, but has never been configured.
-O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../coreutils_5.2.1-2.1_amd64.deb containing coreutils, pre-dependency problem:
-O:  coreutils pre-depends on libc6 (>= 2.3.5-1)
-O:   libc6 is unpacked, but has never been configured.
-O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking coreutils (from .../coreutils_5.2.1-2.1_amd64.deb) ...
-P: Unpacking package coreutils
-O: Selecting previously deselected package debianutils.
-O: dpkg: regarding .../debianutils_2.15_amd64.deb containing debianutils, pre-dependency problem:
-O:  debianutils pre-depends on libc6 (>= 2.3.5-1)
-O:   libc6 is unpacked, but has never been configured.
-O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../debianutils_2.15_amd64.deb containing debianutils, pre-dependency problem:
-O:  debianutils pre-depends on coreutils (>= 4.5.8-1)
-O:   coreutils is unpacked, but has never been configured.
-O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking debianutils (from .../debianutils_2.15_amd64.deb) ...
-P: Unpacking package debianutils
 O: Selecting previously deselected package sed.
 O: dpkg: regarding .../sed_4.1.4-4_amd64.deb containing sed, pre-dependency problem:
 O:  sed pre-depends on libc6 (>= 2.3.5-1)
@@ -416,18 +415,18 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking sed (from .../sed_4.1.4-4_amd64.deb) ...
 P: Unpacking package sed
 O: Selecting previously deselected package libncurses5.
-O: Unpacking libncurses5 (from .../libncurses5_5.4-9_amd64.deb) ...
+O: Unpacking libncurses5 (from .../libncurses5_5.5-1_amd64.deb) ...
 P: Unpacking package libncurses5
 O: Selecting previously deselected package ncurses-bin.
-O: dpkg: regarding .../ncurses-bin_5.4-9_amd64.deb containing ncurses-bin, pre-dependency problem:
-O:  ncurses-bin pre-depends on libc6 (>= 2.3.2.ds1-21)
+O: dpkg: regarding .../ncurses-bin_5.5-1_amd64.deb containing ncurses-bin, pre-dependency problem:
+O:  ncurses-bin pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../ncurses-bin_5.4-9_amd64.deb containing ncurses-bin, pre-dependency problem:
+O: dpkg: regarding .../ncurses-bin_5.5-1_amd64.deb containing ncurses-bin, pre-dependency problem:
 O:  ncurses-bin pre-depends on libncurses5 (>= 5.4-5)
 O:   libncurses5 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking ncurses-bin (from .../ncurses-bin_5.4-9_amd64.deb) ...
+O: Unpacking ncurses-bin (from .../ncurses-bin_5.5-1_amd64.deb) ...
 P: Unpacking package ncurses-bin
 O: Selecting previously deselected package lsb-base.
 O: Unpacking lsb-base (from .../lsb-base_3.0-9_all.deb) ...
@@ -602,7 +601,7 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking grep (from .../grep_2.5.1.ds2-1_amd64.deb) ...
 P: Unpacking package grep
 O: Selecting previously deselected package ncurses-base.
-O: Unpacking ncurses-base (from .../ncurses-base_5.4-9_all.deb) ...
+O: Unpacking ncurses-base (from .../ncurses-base_5.5-1_all.deb) ...
 P: Unpacking package ncurses-base
 O: Selecting previously deselected package mawk.
 O: dpkg: regarding .../mawk_1.3.3-11_amd64.deb containing mawk, pre-dependency problem:
@@ -685,7 +684,7 @@ P: Configuring package gcc-4.0-base
 O: Setting up libpam-runtime (0.79-3) ...
 P: Configuring package libpam-runtime
 O: 
-O: Setting up libc6 (2.3.5-6) ...
+O: Setting up libc6 (2.3.5-7) ...
 P: Configuring package libc6
 O: Non-interactive mode, setting timezone to UTC.  Run tzconfig to change.
 O: 
@@ -718,7 +717,7 @@ P: Configuring package libgcc1
 O: 
 O: Setting up libtext-iconv-perl (1.4-2) ...
 P: Configuring package libtext-iconv-perl
-O: Setting up libncurses5 (5.4-9) ...
+O: Setting up libncurses5 (5.5-1) ...
 P: Configuring package libncurses5
 O: 
 O: Setting up libattr1 (2.4.25-1) ...
@@ -788,9 +787,9 @@ O:
 O: Setting up procps (3.2.5-1) ...
 P: Configuring package procps
 O: 
-O: Setting up ncurses-base (5.4-9) ...
+O: Setting up ncurses-base (5.5-1) ...
 P: Configuring package ncurses-base
-O: Setting up ncurses-bin (5.4-9) ...
+O: Setting up ncurses-bin (5.5-1) ...
 P: Configuring package ncurses-bin
 O: Setting up libpam-modules (0.79-3) ...
 P: Configuring package libpam-modules
@@ -836,8 +835,7 @@ P: Configuring package debconf
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 
-O: 4510 files and directories currently installed.)
+O: (Reading database ... 4510 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
@@ -856,7 +854,8 @@ O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.d
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package apt.
-O: (Reading database ... 4515 files and directories currently installed.)
+O: (Reading database ... 
+O: 4515 files and directories currently installed.)
 O: Unpacking apt (from .../bootstrap/apt_0.6.41_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.41) ...
@@ -865,7 +864,7 @@ O:
 O: Get:1 bootstrap: . Release.gpg [189B]
 O: Get:2 bootstrap: . Release [4800B]
 O: Ign bootstrap: . Release
-O: Fetched 4989B in 0s (41.4kB/s)
+O: Fetched 4989B in 0s (43.8kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -875,6 +874,7 @@ O: W:
 O: You may want to run apt-get update to correct these problems
 O: 
 O: Reading package lists...
+O: 
 O: Building dependency tree...
 O: 
 O: Suggested packages:
@@ -1004,7 +1004,7 @@ O: Selecting previously deselected package libgnutls12.
 O: Unpacking libgnutls12 (from .../libgnutls12_1.2.6-1_amd64.deb) ...
 P: Unpacking package libgnutls12
 O: Selecting previously deselected package libncursesw5.
-O: Unpacking libncursesw5 (from .../libncursesw5_5.4-9_amd64.deb) ...
+O: Unpacking libncursesw5 (from .../libncursesw5_5.5-1_amd64.deb) ...
 P: Unpacking package libncursesw5
 O: Selecting previously deselected package libpcre3.
 O: Unpacking libpcre3 (from .../libpcre3_6.4-1_amd64.deb) ...
@@ -1070,10 +1070,10 @@ O: Selecting previously deselected package telnet.
 O: Unpacking telnet (from .../telnet_0.17-32_amd64.deb) ...
 P: Unpacking package telnet
 O: Selecting previously deselected package dhcp3-common.
-O: Unpacking dhcp3-common (from .../dhcp3-common_3.0.3-4_amd64.deb) ...
+O: Unpacking dhcp3-common (from .../dhcp3-common_3.0.3-5_amd64.deb) ...
 P: Unpacking package dhcp3-common
 O: Selecting previously deselected package dhcp3-client.
-O: Unpacking dhcp3-client (from .../dhcp3-client_3.0.3-4_amd64.deb) ...
+O: Unpacking dhcp3-client (from .../dhcp3-client_3.0.3-5_amd64.deb) ...
 P: Unpacking package dhcp3-client
 O: Selecting previously deselected package psmisc.
 O: Unpacking psmisc (from .../psmisc_21.6-1_amd64.deb) ...
@@ -1158,7 +1158,7 @@ O:
 O: Setting up libgnutls12 (1.2.6-1) ...
 P: Configuring package libgnutls12
 O: 
-O: Setting up libncursesw5 (5.4-9) ...
+O: Setting up libncursesw5 (5.5-1) ...
 P: Configuring package libncursesw5
 O: 
 O: Setting up libpcre3 (6.4-1) ...
@@ -1226,9 +1226,9 @@ P: Configuring package exim4
 O: Setting up telnet (0.17-32) ...
 P: Configuring package telnet
 O: 
-O: Setting up dhcp3-common (3.0.3-4) ...
+O: Setting up dhcp3-common (3.0.3-5) ...
 P: Configuring package dhcp3-common
-O: Setting up dhcp3-client (3.0.3-4) ...
+O: Setting up dhcp3-client (3.0.3-5) ...
 P: Configuring package dhcp3-client
 O: 
 O: Setting up psmisc (21.6-1) ...
@@ -1292,8 +1292,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 [4800B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3709kB]
-Fetched 3714kB in 1s (1925kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3710kB]
+Fetched 3715kB in 2s (1716kB/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
@@ -1320,14 +1320,13 @@ The following NEW packages will be installed:
   libc6-dev libstdc++6-4.0-dev linux-kernel-headers make patch perl
   perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
-Need to get 5677kB/20.5MB of archives.
-After unpacking 80.7MB of additional disk space will be used.
+Need to get 2297kB/20.5MB of archives.
+After unpacking 80.6MB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   binutils cpp-4.0 cpp perl-modules perl patch make dpkg-dev gcc-4.0 gcc
   libstdc++6-4.0-dev g++-4.0 g++ linux-kernel-headers libc6-dev build-essential
-Get:1 http://ftp.jp.debian.org sid/main perl 5.8.7-6 [4035kB]
-Get:2 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.13+0rc3-2 [1643kB]
-Fetched 5677kB in 3s (1650kB/s)
+Get:1 http://ftp.jp.debian.org sid/main libc6-dev 2.3.5-7 [2297kB]
+Fetched 2297kB in 1s (1822kB/s)
 Selecting previously deselected package binutils.
 (Reading database ... 7411 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20050902-1_amd64.deb) ...
@@ -1358,7 +1357,7 @@ Unpacking g++ (from .../g++_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
 Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.3.5-6_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.3.5-7_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.1_amd64.deb) ...
 Setting up binutils (2.16.1cvs20050902-1) ...
@@ -1372,7 +1371,7 @@ Setting up gcc-4.0 (4.0.2-2) ...
 Setting up gcc (4.0.2-1) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
-Setting up libc6-dev (2.3.5-6) ...
+Setting up libc6-dev (2.3.5-7) ...
 Setting up libstdc++6-4.0-dev (4.0.2-2) ...
 Setting up perl-modules (5.8.7-6) ...
 Setting up g++-4.0 (4.0.2-2) ...
@@ -1383,10 +1382,9 @@ Setting up perl (5.8.7-6) ...
 Setting up dpkg-dev (1.13.11) ...
 Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
- -> new cache content perl_5.8.7-6_amd64.deb added
- -> new cache content linux-kernel-headers_2.6.13+0rc3-2_amd64.deb added
+ -> new cache content libc6-dev_2.3.5-7_amd64.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24522 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//616 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index cbd81bc..034bc82 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/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -12,4 +12,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//8940 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//22094 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sarge.log b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
index 29b2014..caf9c6b 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/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -12,4 +12,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//29999 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12086 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index 9335844..859d01c 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/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -12,4 +12,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//26601 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//2844 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 667fece..e1dac5d 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/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -17,8 +17,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:4 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [104kB]
-Fetched 114kB in 0s (384kB/s)
+Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [108kB]
+Fetched 117kB in 0s (685kB/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?)
@@ -62,6 +62,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//11021 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24149 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index e76a423..60334c0 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/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/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 [3709kB]
+Get:1 http://ftp.jp.debian.org sid/main Packages [3710kB]
 Get:2 http://ftp.jp.debian.org sid/main Release [97B]
-Fetched 3710kB in 2s (1717kB/s)
+Fetched 3710kB in 2s (1820kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -23,15 +23,30 @@ The following NEW packages will be installed:
   libsigc++-1.2-5c2 libssl0.9.8
 The following packages will be upgraded:
   apt apt-utils aptitude bash binutils bsdutils console-common console-tools
-  cpp debianutils exim4 exim4-base exim4-config exim4-daemon-light g++ gcc
-  gcc-3.3-base info libacl1 libattr1 libconsole libdb4.2 libdb4.3 libpcre3
-  libssl0.9.7 libstdc++5 libtext-charwidth-perl libtext-iconv-perl
-  libtext-wrapi18n-perl linux-kernel-headers login mount passwd perl perl-base
-  perl-modules sed tar telnet util-linux wget
-41 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/25.0MB of archives.
-After unpacking 5591kB of additional disk space will be used.
+  cpp debianutils dhcp3-client dhcp3-common g++ gcc gcc-3.3-base info libacl1
+  libattr1 libc6 libc6-dev libconsole libdb4.2 libdb4.3 libncurses5
+  libncursesw5 libpcre3 libssl0.9.7 libstdc++5 libtext-charwidth-perl
+  libtext-iconv-perl libtext-wrapi18n-perl linux-kernel-headers login mount
+  ncurses-base ncurses-bin passwd perl perl-base perl-modules sed tar telnet
+  util-linux wget
+45 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0B/31.6MB of archives.
+After unpacking 5501kB of additional disk space will be used.
 (Reading database ... 11174 files and directories currently installed.)
+Preparing to replace linux-kernel-headers 2.6.13+0rc3-1.1 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
+Unpacking replacement linux-kernel-headers ...
+Preparing to replace libc6-dev 2.3.5-6 (using .../libc6-dev_2.3.5-7_amd64.deb) ...
+Unpacking replacement libc6-dev ...
+Preparing to replace libc6 2.3.5-6 (using .../libc6_2.3.5-7_amd64.deb) ...
+Unpacking replacement libc6 ...
+Setting up libc6 (2.3.5-7) ...
+Installing new version of config file /etc/init.d/glibc.sh ...
+Current default timezone: 'UTC'.
+Local time is now:      Mon Oct 17 03:21:29 UTC 2005.
+Universal Time is now:  Mon Oct 17 03:21:29 UTC 2005.
+Run 'tzconfig' if you wish to change it.
+
+(Reading database ... 11408 files and directories currently installed.)
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.41_amd64.deb) ...
@@ -39,10 +54,10 @@ Unpacking replacement apt-utils ...
 dpkg: libsigc++-1.2-5c102: dependency problems, but removing anyway as you request:
  aptitude depends on libsigc++-1.2-5c102; however:
   Package libsigc++-1.2-5c102 is to be removed.
-(Reading database ... 11176 files and directories currently installed.)
+(Reading database ... 11410 files and directories currently installed.)
 Removing libsigc++-1.2-5c102 ...
 Selecting previously deselected package libsigc++-1.2-5c2.
-(Reading database ... 11170 files and directories currently installed.)
+(Reading database ... 11404 files and directories currently installed.)
 Unpacking libsigc++-1.2-5c2 (from .../libsigc++-1.2-5c2_1.2.5-5_amd64.deb) ...
 Preparing to replace aptitude 0.2.15.9-2 (using .../aptitude_0.2.15.9-6_amd64.deb) ...
 Unpacking replacement aptitude ...
@@ -50,13 +65,18 @@ Preparing to replace apt 0.5.28.6 (using .../archives/apt_0.6.41_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.41) ...
 
-(Reading database ... 11172 files and directories currently installed.)
+(Reading database ... 11406 files and directories currently installed.)
+Preparing to replace libncurses5 5.4-9 (using .../libncurses5_5.5-1_amd64.deb) ...
+Unpacking replacement libncurses5 ...
+Setting up libncurses5 (5.5-1) ...
+
+(Reading database ... 11406 files and directories currently installed.)
 Preparing to replace debianutils 2.14.3 (using .../debianutils_2.15_amd64.deb) ...
 Unpacking replacement debianutils ...
 Replacing files in old package passwd ...
 Setting up debianutils (2.15) ...
 
-(Reading database ... 11171 files and directories currently installed.)
+(Reading database ... 11405 files and directories currently installed.)
 Preparing to replace login 1:4.0.12-6 (using .../login_1%3a4.0.13-1_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-1) ...
@@ -64,7 +84,7 @@ Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11172 files and directories currently installed.)
+(Reading database ... 11406 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.12-6 (using .../passwd_1%3a4.0.13-1_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-1) ...
@@ -79,24 +99,28 @@ Installing new version of config file /etc/pam.d/groupdel ...
 Installing new version of config file /etc/pam.d/groupmod ...
 Installing new version of config file /etc/pam.d/newusers ...
 
-(Reading database ... 11174 files and directories currently installed.)
+(Reading database ... 11408 files and directories currently installed.)
 Preparing to replace bash 3.0-16 (using .../archives/bash_3.0-17_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.0-17) ...
 Installing new version of config file /etc/bash.bashrc ...
 Installing new version of config file /etc/bash_completion ...
 
-(Reading database ... 11174 files and directories currently installed.)
+(Reading database ... 11408 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12p-8) ...
 
-(Reading database ... 11174 files and directories currently installed.)
+(Reading database ... 11408 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12p-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12p-8) ...
 
-(Reading database ... 11174 files and directories currently installed.)
+(Reading database ... 11408 files and directories currently installed.)
+Preparing to replace ncurses-bin 5.4-9 (using .../ncurses-bin_5.5-1_amd64.deb) ...
+Unpacking replacement ncurses-bin ...
+Setting up ncurses-bin (5.5-1) ...
+(Reading database ... 11408 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.7-3 (using .../perl-modules_5.8.7-6_all.deb) ...
 Unpacking replacement perl-modules ...
 Preparing to replace perl 5.8.7-3 (using .../perl_5.8.7-6_amd64.deb) ...
@@ -104,24 +128,28 @@ Unpacking replacement perl ...
 Preparing to replace perl-base 5.8.7-3 (using .../perl-base_5.8.7-6_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.7-6) ...
-(Reading database ... 11281 files and directories currently installed.)
+(Reading database ... 11515 files and directories currently installed.)
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-4) ...
 
-(Reading database ... 11282 files and directories currently installed.)
+(Reading database ... 11516 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-2_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
-(Reading database ... 11286 files and directories currently installed.)
+(Reading database ... 11520 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12p-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11286 files and directories currently installed.)
+(Reading database ... 11520 files and directories currently installed.)
+Preparing to replace ncurses-base 5.4-9 (using .../ncurses-base_5.5-1_all.deb) ...
+Unpacking replacement ncurses-base ...
+Setting up ncurses-base (5.5-1) ...
+(Reading database ... 11520 files and directories currently installed.)
 Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-57_amd64.deb) ...
 Unpacking replacement console-tools ...
 Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-57_amd64.deb) ...
@@ -136,7 +164,7 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.32-1) ...
 
-(Reading database ... 11286 files and directories currently installed.)
+(Reading database ... 11520 files and directories currently installed.)
 Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3-base ...
 Preparing to replace libstdc++5 1:3.3.6-7 (using .../libstdc++5_1%3a3.3.6-10_amd64.deb) ...
@@ -144,9 +172,11 @@ Unpacking replacement libstdc++5 ...
 Setting up gcc-3.3-base (3.3.6-10) ...
 Setting up libstdc++5 (3.3.6-10) ...
 
-(Reading database ... 11286 files and directories currently installed.)
+(Reading database ... 11520 files and directories currently installed.)
 Preparing to replace info 4.7-2.2 (using .../archives/info_4.8-1_amd64.deb) ...
 Unpacking replacement info ...
+Preparing to replace libncursesw5 5.4-9 (using .../libncursesw5_5.5-1_amd64.deb) ...
+Unpacking replacement libncursesw5 ...
 Preparing to replace libpcre3 6.3-1 (using .../libpcre3_6.4-1_amd64.deb) ...
 Unpacking replacement libpcre3 ...
 Preparing to replace libssl0.9.7 0.9.7g-2 (using .../libssl0.9.7_0.9.7g-5_amd64.deb) ...
@@ -165,14 +195,6 @@ Preparing to replace binutils 2.16.1-2 (using .../binutils_2.16.1cvs20050902-1_a
 Unpacking replacement binutils ...
 Preparing to replace cpp 4:4.0.1-3 (using .../cpp_4%3a4.0.2-1_amd64.deb) ...
 Unpacking replacement cpp ...
-Preparing to replace exim4-daemon-light 4.52-2 (using .../exim4-daemon-light_4.54-1_amd64.deb) ...
-Unpacking replacement exim4-daemon-light ...
-Preparing to replace exim4-config 4.52-2 (using .../exim4-config_4.54-1_all.deb) ...
-Unpacking replacement exim4-config ...
-Preparing to replace exim4-base 4.52-2 (using .../exim4-base_4.54-1_amd64.deb) ...
-Unpacking replacement exim4-base ...
-Preparing to replace exim4 4.52-2 (using .../archives/exim4_4.54-1_all.deb) ...
-Unpacking replacement exim4 ...
 Preparing to replace gcc 4:4.0.1-3 (using .../gcc_4%3a4.0.2-1_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
@@ -180,10 +202,14 @@ Preparing to replace g++ 4:4.0.1-3 (using .../g++_4%3a4.0.2-1_amd64.deb) ...
 Unpacking replacement g++ ...
 Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
-Preparing to replace linux-kernel-headers 2.6.13+0rc3-1.1 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
-Unpacking replacement linux-kernel-headers ...
 Preparing to replace telnet 0.17-31 (using .../telnet_0.17-32_amd64.deb) ...
 Unpacking replacement telnet ...
+Preparing to replace dhcp3-client 3.0.3-4 (using .../dhcp3-client_3.0.3-5_amd64.deb) ...
+Unpacking replacement dhcp3-client ...
+Preparing to replace dhcp3-common 3.0.3-4 (using .../dhcp3-common_3.0.3-5_amd64.deb) ...
+Unpacking replacement dhcp3-common ...
+Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
+Setting up libc6-dev (2.3.5-7) ...
 Setting up libdb4.2 (4.2.52-20) ...
 Setting up apt-utils (0.6.41) ...
 
@@ -195,6 +221,8 @@ Setting up libconsole (0.2.3dbs-57) ...
 
 Setting up info (4.8-1) ...
 
+Setting up libncursesw5 (5.5-1) ...
+
 Setting up libpcre3 (6.4-1) ...
 
 Setting up libssl0.9.7 (0.9.7g-5) ...
@@ -205,27 +233,16 @@ Setting up libtext-wrapi18n-perl (0.06-3) ...
 Setting up binutils (2.16.1cvs20050902-1) ...
 
 Setting up cpp (4.0.2-1) ...
-Setting up exim4-config (4.54-1) ...
-Installing new version of config file /etc/exim4/conf.d/router/150_exim4-config_hubbed_hosts ...
-Installing new version of config file /etc/exim4/conf.d/router/300_exim4-config_real_local ...
-Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
-Installing new version of config file /etc/exim4/conf.d/rewrite/31_exim4-config_rewriting ...
-Installing new version of config file /etc/exim4/exim4.conf.template ...
-
-Setting up exim4-base (4.54-1) ...
-Installing new version of config file /etc/init.d/exim4 ...
-
-Setting up exim4-daemon-light (4.54-1) ...
-
-Setting up exim4 (4.54-1) ...
 Setting up gcc (4.0.2-1) ...
 
 Setting up g++ (4.0.2-1) ...
 
 Setting up libdb4.3 (4.3.29-1) ...
-Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
 Setting up telnet (0.17-32) ...
 
+Setting up dhcp3-common (3.0.3-5) ...
+Setting up dhcp3-client (3.0.3-5) ...
+
 Setting up libssl0.9.8 (0.9.8-3) ...
 
 Setting up wget (1.10.2-1) ...
@@ -251,6 +268,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//9515 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//22685 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 7a86c02..9a6325d 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/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -17,8 +17,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:4 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [104kB]
-Fetched 114kB in 0s (340kB/s)
+Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [108kB]
+Fetched 117kB in 0s (280kB/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?)
@@ -62,6 +62,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//6064 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19112 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
index 83a7ecd..5a72821 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/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/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 [3709kB]
+Get:1 http://ftp.jp.debian.org sid/main Packages [3710kB]
 Get:2 http://ftp.jp.debian.org sid/main Release [97B]
-Fetched 3710kB in 2s (1654kB/s)
+Fetched 3710kB in 1s (1889kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -23,26 +23,39 @@ The following NEW packages will be installed:
   libsigc++-1.2-5c2 libssl0.9.8
 The following packages will be upgraded:
   apt apt-utils aptitude bash binutils bsdutils console-common console-tools
-  cpp cpp-3.3 debianutils exim4 exim4-base exim4-config exim4-daemon-light g++
-  g++-3.3 gcc gcc-3.3 gcc-3.3-base info libacl1 libattr1 libconsole libdb4.2
-  libdb4.3 libpcre3 libssl0.9.7 libstdc++5 libstdc++5-3.3-dev
-  libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl
-  linux-kernel-headers login module-init-tools mount passwd perl perl-base
-  perl-modules sed tar telnet util-linux wget
-46 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Need to get 5617kB/31.0MB of archives.
-After unpacking 5513kB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main debianutils 2.15 [57.4kB]
-Get:2 http://ftp.jp.debian.org sid/main login 1:4.0.13-1 [569kB]
-Get:3 http://ftp.jp.debian.org sid/main passwd 1:4.0.13-1 [661kB]
-Get:4 http://ftp.jp.debian.org sid/main bash 3.0-17 [846kB]
-Get:5 http://ftp.jp.debian.org sid/main perl-base 5.8.7-6 [819kB]
-Get:6 http://ftp.jp.debian.org sid/main libssl0.9.7 0.9.7g-5 [740kB]
-Get:7 http://ftp.jp.debian.org sid/main libssl0.9.8 0.9.8-3 [869kB]
-Get:8 http://ftp.jp.debian.org sid/main wget 1.10.2-1 [622kB]
-Get:9 http://ftp.jp.debian.org sid/main libdb4.3 4.3.29-1 [434kB]
-Fetched 5617kB in 3s (1561kB/s)
+  cpp cpp-3.3 debianutils dhcp3-client dhcp3-common g++ g++-3.3 gcc gcc-3.3
+  gcc-3.3-base info libacl1 libattr1 libc6 libc6-dev libconsole libdb4.2
+  libdb4.3 libncurses5 libncursesw5 libpcre3 libssl0.9.7 libstdc++5
+  libstdc++5-3.3-dev libtext-charwidth-perl libtext-iconv-perl
+  libtext-wrapi18n-perl linux-kernel-headers login module-init-tools mount
+  ncurses-base ncurses-bin passwd perl perl-base perl-modules sed tar telnet
+  util-linux wget
+50 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 5858kB/37.6MB of archives.
+After unpacking 5423kB of additional disk space will be used.
+Get:1 http://ftp.jp.debian.org sid/main libc6 2.3.5-7 [4292kB]
+Get:2 http://ftp.jp.debian.org sid/main libncurses5 5.5-1 [322kB]
+Get:3 http://ftp.jp.debian.org sid/main ncurses-bin 5.5-1 [227kB]
+Get:4 http://ftp.jp.debian.org sid/main ncurses-base 5.5-1 [12.8kB]
+Get:5 http://ftp.jp.debian.org sid/main libncursesw5 5.5-1 [340kB]
+Get:6 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.3-5 [214kB]
+Get:7 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.3-5 [450kB]
+Fetched 5858kB in 3s (1713kB/s)
 (Reading database ... 11593 files and directories currently installed.)
+Preparing to replace linux-kernel-headers 2.6.13+0rc3-1.1 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
+Unpacking replacement linux-kernel-headers ...
+Preparing to replace libc6-dev 2.3.5-6 (using .../libc6-dev_2.3.5-7_amd64.deb) ...
+Unpacking replacement libc6-dev ...
+Preparing to replace libc6 2.3.5-6 (using .../libc6_2.3.5-7_amd64.deb) ...
+Unpacking replacement libc6 ...
+Setting up libc6 (2.3.5-7) ...
+Installing new version of config file /etc/init.d/glibc.sh ...
+Current default timezone: 'UTC'.
+Local time is now:      Mon Oct 17 03:15:36 UTC 2005.
+Universal Time is now:  Mon Oct 17 03:15:36 UTC 2005.
+Run 'tzconfig' if you wish to change it.
+
+(Reading database ... 11827 files and directories currently installed.)
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.41_amd64.deb) ...
@@ -50,10 +63,10 @@ Unpacking replacement apt-utils ...
 dpkg: libsigc++-1.2-5c102: dependency problems, but removing anyway as you request:
  aptitude depends on libsigc++-1.2-5c102; however:
   Package libsigc++-1.2-5c102 is to be removed.
-(Reading database ... 11595 files and directories currently installed.)
+(Reading database ... 11829 files and directories currently installed.)
 Removing libsigc++-1.2-5c102 ...
 Selecting previously deselected package libsigc++-1.2-5c2.
-(Reading database ... 11589 files and directories currently installed.)
+(Reading database ... 11823 files and directories currently installed.)
 Unpacking libsigc++-1.2-5c2 (from .../libsigc++-1.2-5c2_1.2.5-5_amd64.deb) ...
 Preparing to replace aptitude 0.2.15.9-2 (using .../aptitude_0.2.15.9-6_amd64.deb) ...
 Unpacking replacement aptitude ...
@@ -61,13 +74,18 @@ Preparing to replace apt 0.5.28.6 (using .../archives/apt_0.6.41_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.41) ...
 
-(Reading database ... 11591 files and directories currently installed.)
+(Reading database ... 11825 files and directories currently installed.)
+Preparing to replace libncurses5 5.4-9 (using .../libncurses5_5.5-1_amd64.deb) ...
+Unpacking replacement libncurses5 ...
+Setting up libncurses5 (5.5-1) ...
+
+(Reading database ... 11825 files and directories currently installed.)
 Preparing to replace debianutils 2.14.3 (using .../debianutils_2.15_amd64.deb) ...
 Unpacking replacement debianutils ...
 Replacing files in old package passwd ...
 Setting up debianutils (2.15) ...
 
-(Reading database ... 11590 files and directories currently installed.)
+(Reading database ... 11824 files and directories currently installed.)
 Preparing to replace login 1:4.0.12-6 (using .../login_1%3a4.0.13-1_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-1) ...
@@ -75,7 +93,7 @@ Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11591 files and directories currently installed.)
+(Reading database ... 11825 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.12-6 (using .../passwd_1%3a4.0.13-1_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-1) ...
@@ -90,24 +108,28 @@ Installing new version of config file /etc/pam.d/groupdel ...
 Installing new version of config file /etc/pam.d/groupmod ...
 Installing new version of config file /etc/pam.d/newusers ...
 
-(Reading database ... 11593 files and directories currently installed.)
+(Reading database ... 11827 files and directories currently installed.)
 Preparing to replace bash 3.0-16 (using .../archives/bash_3.0-17_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.0-17) ...
 Installing new version of config file /etc/bash.bashrc ...
 Installing new version of config file /etc/bash_completion ...
 
-(Reading database ... 11593 files and directories currently installed.)
+(Reading database ... 11827 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12p-8) ...
 
-(Reading database ... 11593 files and directories currently installed.)
+(Reading database ... 11827 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12p-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12p-8) ...
 
-(Reading database ... 11593 files and directories currently installed.)
+(Reading database ... 11827 files and directories currently installed.)
+Preparing to replace ncurses-bin 5.4-9 (using .../ncurses-bin_5.5-1_amd64.deb) ...
+Unpacking replacement ncurses-bin ...
+Setting up ncurses-bin (5.5-1) ...
+(Reading database ... 11827 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.7-3 (using .../perl-modules_5.8.7-6_all.deb) ...
 Unpacking replacement perl-modules ...
 Preparing to replace perl 5.8.7-3 (using .../perl_5.8.7-6_amd64.deb) ...
@@ -115,24 +137,28 @@ Unpacking replacement perl ...
 Preparing to replace perl-base 5.8.7-3 (using .../perl-base_5.8.7-6_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.7-6) ...
-(Reading database ... 11700 files and directories currently installed.)
+(Reading database ... 11934 files and directories currently installed.)
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-4) ...
 
-(Reading database ... 11701 files and directories currently installed.)
+(Reading database ... 11935 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-2_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
-(Reading database ... 11705 files and directories currently installed.)
+(Reading database ... 11939 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12p-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11705 files and directories currently installed.)
+(Reading database ... 11939 files and directories currently installed.)
+Preparing to replace ncurses-base 5.4-9 (using .../ncurses-base_5.5-1_all.deb) ...
+Unpacking replacement ncurses-base ...
+Setting up ncurses-base (5.5-1) ...
+(Reading database ... 11939 files and directories currently installed.)
 Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-57_amd64.deb) ...
 Unpacking replacement console-tools ...
 Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-57_amd64.deb) ...
@@ -147,7 +173,7 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.32-1) ...
 
-(Reading database ... 11705 files and directories currently installed.)
+(Reading database ... 11939 files and directories currently installed.)
 Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3-base ...
 Preparing to replace libstdc++5 1:3.3.6-7 (using .../libstdc++5_1%3a3.3.6-10_amd64.deb) ...
@@ -155,9 +181,11 @@ Unpacking replacement libstdc++5 ...
 Setting up gcc-3.3-base (3.3.6-10) ...
 Setting up libstdc++5 (3.3.6-10) ...
 
-(Reading database ... 11705 files and directories currently installed.)
+(Reading database ... 11939 files and directories currently installed.)
 Preparing to replace info 4.7-2.2 (using .../archives/info_4.8-1_amd64.deb) ...
 Unpacking replacement info ...
+Preparing to replace libncursesw5 5.4-9 (using .../libncursesw5_5.5-1_amd64.deb) ...
+Unpacking replacement libncursesw5 ...
 Preparing to replace libpcre3 6.3-1 (using .../libpcre3_6.4-1_amd64.deb) ...
 Unpacking replacement libpcre3 ...
 Preparing to replace libssl0.9.7 0.9.7g-2 (using .../libssl0.9.7_0.9.7g-5_amd64.deb) ...
@@ -178,14 +206,6 @@ Preparing to replace binutils 2.16.1-2 (using .../binutils_2.16.1cvs20050902-1_a
 Unpacking replacement binutils ...
 Preparing to replace cpp 4:4.0.1-3 (using .../cpp_4%3a4.0.2-1_amd64.deb) ...
 Unpacking replacement cpp ...
-Preparing to replace exim4-daemon-light 4.52-2 (using .../exim4-daemon-light_4.54-1_amd64.deb) ...
-Unpacking replacement exim4-daemon-light ...
-Preparing to replace exim4-config 4.52-2 (using .../exim4-config_4.54-1_all.deb) ...
-Unpacking replacement exim4-config ...
-Preparing to replace exim4-base 4.52-2 (using .../exim4-base_4.54-1_amd64.deb) ...
-Unpacking replacement exim4-base ...
-Preparing to replace exim4 4.52-2 (using .../archives/exim4_4.54-1_all.deb) ...
-Unpacking replacement exim4 ...
 Preparing to replace gcc 4:4.0.1-3 (using .../gcc_4%3a4.0.2-1_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
@@ -193,18 +213,22 @@ Preparing to replace g++ 4:4.0.1-3 (using .../g++_4%3a4.0.2-1_amd64.deb) ...
 Unpacking replacement g++ ...
 Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
-Preparing to replace linux-kernel-headers 2.6.13+0rc3-1.1 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
-Unpacking replacement linux-kernel-headers ...
 Preparing to replace telnet 0.17-31 (using .../telnet_0.17-32_amd64.deb) ...
 Unpacking replacement telnet ...
 Preparing to replace cpp-3.3 1:3.3.6-7 (using .../cpp-3.3_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement cpp-3.3 ...
+Preparing to replace dhcp3-client 3.0.3-4 (using .../dhcp3-client_3.0.3-5_amd64.deb) ...
+Unpacking replacement dhcp3-client ...
+Preparing to replace dhcp3-common 3.0.3-4 (using .../dhcp3-common_3.0.3-5_amd64.deb) ...
+Unpacking replacement dhcp3-common ...
 Preparing to replace gcc-3.3 1:3.3.6-7 (using .../gcc-3.3_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3 ...
 Preparing to replace libstdc++5-3.3-dev 1:3.3.6-7 (using .../libstdc++5-3.3-dev_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement libstdc++5-3.3-dev ...
 Preparing to replace g++-3.3 1:3.3.6-7 (using .../g++-3.3_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement g++-3.3 ...
+Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
+Setting up libc6-dev (2.3.5-7) ...
 Setting up libdb4.2 (4.2.52-20) ...
 Setting up apt-utils (0.6.41) ...
 
@@ -216,6 +240,8 @@ Setting up libconsole (0.2.3dbs-57) ...
 
 Setting up info (4.8-1) ...
 
+Setting up libncursesw5 (5.5-1) ...
+
 Setting up libpcre3 (6.4-1) ...
 
 Setting up libssl0.9.7 (0.9.7g-5) ...
@@ -230,28 +256,17 @@ Setting up libtext-wrapi18n-perl (0.06-3) ...
 Setting up binutils (2.16.1cvs20050902-1) ...
 
 Setting up cpp (4.0.2-1) ...
-Setting up exim4-config (4.54-1) ...
-Installing new version of config file /etc/exim4/conf.d/router/150_exim4-config_hubbed_hosts ...
-Installing new version of config file /etc/exim4/conf.d/router/300_exim4-config_real_local ...
-Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
-Installing new version of config file /etc/exim4/conf.d/rewrite/31_exim4-config_rewriting ...
-Installing new version of config file /etc/exim4/exim4.conf.template ...
-
-Setting up exim4-base (4.54-1) ...
-Installing new version of config file /etc/init.d/exim4 ...
-
-Setting up exim4-daemon-light (4.54-1) ...
-
-Setting up exim4 (4.54-1) ...
 Setting up gcc (4.0.2-1) ...
 
 Setting up g++ (4.0.2-1) ...
 
 Setting up libdb4.3 (4.3.29-1) ...
-Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
 Setting up telnet (0.17-32) ...
 
 Setting up cpp-3.3 (3.3.6-10) ...
+Setting up dhcp3-common (3.0.3-5) ...
+Setting up dhcp3-client (3.0.3-5) ...
+
 Setting up gcc-3.3 (3.3.6-10) ...
 Setting up perl-modules (5.8.7-6) ...
 Setting up libssl0.9.8 (0.9.8-3) ...
@@ -278,17 +293,15 @@ dpkg-dev is already the newest version.
 apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Copying back the cached apt archive contents
- -> new cache content debianutils_2.15_amd64.deb added
- -> new cache content login_1%3a4.0.13-1_amd64.deb added
- -> new cache content passwd_1%3a4.0.13-1_amd64.deb added
- -> new cache content bash_3.0-17_amd64.deb added
- -> new cache content perl-base_5.8.7-6_amd64.deb added
- -> new cache content libssl0.9.7_0.9.7g-5_amd64.deb added
- -> new cache content libssl0.9.8_0.9.8-3_amd64.deb added
- -> new cache content wget_1.10.2-1_amd64.deb added
- -> new cache content libdb4.3_4.3.29-1_amd64.deb added
+ -> new cache content libc6_2.3.5-7_amd64.deb added
+ -> new cache content libncurses5_5.5-1_amd64.deb added
+ -> new cache content ncurses-bin_5.5-1_amd64.deb added
+ -> new cache content ncurses-base_5.5-1_all.deb added
+ -> new cache content libncursesw5_5.5-1_amd64.deb added
+ -> new cache content dhcp3-client_3.0.3-5_amd64.deb added
+ -> new cache content dhcp3-common_3.0.3-5_amd64.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//4432 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//17524 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
index bf4fd9b..da497e8 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/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/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 [3365kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3355kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3365kB in 3s (1034kB/s)
+Fetched 3355kB in 1s (1875kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -37,8 +37,8 @@ The following packages will be upgraded:
   ncurses-bin net-tools netbase netkit-inetd passwd perl perl-base perl-modules
   procps psmisc sysv-rc sysvinit tasksel telnet wget whiptail zlib1g
 98 upgraded, 15 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/52.9MB of archives.
-After unpacking 27.6MB of additional disk space will be used.
+Need to get 0B/53.0MB of archives.
+After unpacking 27.7MB of additional disk space will be used.
 (Reading database ... 10733 files and directories currently installed.)
 Preparing to replace linux-kernel-headers 2.5.999-test7-bk-17 (using .../linux-kernel-headers_2.6.13+0rc3-1.1_amd64.deb) ...
 Unpacking replacement linux-kernel-headers ...
@@ -69,8 +69,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-6) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Sat Oct 15 03:13:10 UTC 2005.
-Universal Time is now:  Sat Oct 15 03:13:10 UTC 2005.
+Local time is now:      Mon Oct 17 03:14:19 UTC 2005.
+Universal Time is now:  Mon Oct 17 03:14:19 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 10830 files and directories currently installed.)
@@ -122,7 +122,7 @@ Selecting previously deselected package libstdc++6.
 Unpacking libstdc++6 (from .../libstdc++6_4.0.2-2_amd64.deb) ...
 Preparing to replace libpcre3 4.5-1.2 (using .../libpcre3_6.3-1_amd64.deb) ...
 Unpacking replacement libpcre3 ...
-Preparing to replace exim4-daemon-light 4.50-8 (using .../exim4-daemon-light_4.52-2_amd64.deb) ...
+Preparing to replace exim4-daemon-light 4.50-8 (using .../exim4-daemon-light_4.54-1_amd64.deb) ...
 Unpacking replacement exim4-daemon-light ...
 Selecting previously deselected package libselinux1.
 Unpacking libselinux1 (from .../libselinux1_1.26-1_amd64.deb) ...
@@ -169,7 +169,7 @@ Preparing to replace adduser 3.63 (using .../adduser_3.67.2_all.deb) ...
 Unpacking replacement adduser ...
 Preparing to replace cron 3.0pl1-86 (using .../cron_3.0pl1-91_amd64.deb) ...
 Unpacking replacement cron ...
-Preparing to replace exim4-config 4.50-8 (using .../exim4-config_4.52-2_all.deb) ...
+Preparing to replace exim4-config 4.50-8 (using .../exim4-config_4.54-1_all.deb) ...
 Unpacking replacement exim4-config ...
 Preparing to replace ncurses-bin 5.4-4 (using .../ncurses-bin_5.4-9_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
@@ -181,7 +181,7 @@ Preparing to replace netkit-inetd 0.10-10 (using .../netkit-inetd_0.10-10.2_amd6
 Unpacking replacement netkit-inetd ...
 Preparing to replace netbase 4.21 (using .../archives/netbase_4.22_all.deb) ...
 Unpacking replacement netbase ...
-Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.52-2_amd64.deb) ...
+Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.54-1_amd64.deb) ...
 Unpacking replacement exim4-base ...
 Selecting previously deselected package libdb4.3.
 Unpacking libdb4.3 (from .../libdb4.3_4.3.28-2_amd64.deb) ...
@@ -464,7 +464,7 @@ Preparing to replace make 3.80-9 (using .../make_3.80-11_amd64.deb) ...
 Unpacking replacement make ...
 Preparing to replace dpkg-dev 1.10.28 (using .../dpkg-dev_1.13.11_all.deb) ...
 Unpacking replacement dpkg-dev ...
-Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.52-2_all.deb) ...
+Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.54-1_all.deb) ...
 Unpacking replacement exim4 ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-2_amd64.deb) ...
@@ -511,12 +511,15 @@ Setting up cron (3.0pl1-91) ...
 Installing new version of config file /etc/cron.daily/standard ...
 Installing new version of config file /etc/pam.d/cron ...
 
-Setting up exim4-config (4.52-2) ...
-Installing new version of config file /etc/exim4/exim4.conf.template ...
+Setting up exim4-config (4.54-1) ...
+Installing new version of config file /etc/exim4/conf.d/acl/30_exim4-config_check_rcpt ...
+Installing new version of config file /etc/exim4/conf.d/router/150_exim4-config_hubbed_hosts ...
+Installing new version of config file /etc/exim4/conf.d/router/300_exim4-config_real_local ...
+Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
+Installing new version of config file /etc/exim4/conf.d/rewrite/31_exim4-config_rewriting ...
 Installing new version of config file /etc/exim4/conf.d/main/03_exim4-config_tlsoptions ...
 Installing new version of config file /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs ...
-Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
-Installing new version of config file /etc/exim4/conf.d/acl/30_exim4-config_check_rcpt ...
+Installing new version of config file /etc/exim4/exim4.conf.template ...
 
 Setting up netkit-inetd (0.10-10.2) ...
 Restarting internet superserver: inetd.
@@ -524,10 +527,11 @@ Restarting internet superserver: inetd.
 Setting up netbase (4.22) ...
 Installing new version of config file /etc/init.d/networking ...
 
-Setting up exim4-base (4.52-2) ...
+Setting up exim4-base (4.54-1) ...
 Installing new version of config file /etc/cron.daily/exim4-base ...
+Installing new version of config file /etc/init.d/exim4 ...
 
-Setting up exim4-daemon-light (4.52-2) ...
+Setting up exim4-daemon-light (4.54-1) ...
 
 Setting up console-common (0.7.53) ...
 Installing new version of config file /etc/init.d/keymap.sh ...
@@ -597,7 +601,7 @@ Setting up cpp-4.0 (4.0.2-2) ...
 Setting up cpp (4.0.1-3) ...
 Setting up make (3.80-11) ...
 
-Setting up exim4 (4.52-2) ...
+Setting up exim4 (4.54-1) ...
 Setting up gcc-4.0 (4.0.2-2) ...
 Setting up gcc (4.0.1-3) ...
 
@@ -634,6 +638,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//30568 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12729 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index 220e0ce..63f773e 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -115,14 +115,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -310,18 +310,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/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; \
@@ -334,26 +334,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/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
@@ -365,7 +365,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
@@ -390,9 +389,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
@@ -404,7 +403,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
-Sat Oct 15 03:21:53 UTC 2005
+Mon Oct 17 03:20:46 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
@@ -474,14 +473,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
-Sat Oct 15 03:21:58 UTC 2005
+Mon Oct 17 03:20:51 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -490,9 +489,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -500,58 +499,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -575,6 +574,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/2691 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/15951 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sarge.log b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
index 508a7f9..d3bf22a 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sarge.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -109,14 +109,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -304,18 +304,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/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; \
@@ -328,26 +328,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -385,8 +385,8 @@ success
 success
 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
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -398,7 +398,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
-Sat Oct 15 03:12:18 UTC 2005
+Mon Oct 17 03:13: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
@@ -411,6 +411,18 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -425,18 +437,6 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -468,7 +468,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
-Sat Oct 15 03:12:23 UTC 2005
+Mon Oct 17 03:13:42 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -484,9 +484,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -494,58 +494,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -569,6 +569,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/23830 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/5987 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index d62ba60..aa94d79 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -122,14 +122,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -317,18 +317,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/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; \
@@ -341,26 +341,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/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
@@ -372,7 +372,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
@@ -407,11 +406,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
-Sat Oct 15 03:07:36 UTC 2005
+Mon Oct 17 03:07:03 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
@@ -481,14 +480,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
-Sat Oct 15 03:07:41 UTC 2005
+Mon Oct 17 03:07:08 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).
 b: b
 c: c
-dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -497,9 +496,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -507,58 +506,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -582,6 +581,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/20501 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/29185 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index a3ae97f..72b2136 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-etch.log
@@ -8,14 +8,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -31,10 +31,10 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Oct 15 12:20:06 JST 2005
-pbuilder-time-stamp: 1129346406
+Current time: Mon Oct 17 12:19:37 JST 2005
+pbuilder-time-stamp: 1129519177
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -102,7 +102,7 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/28812/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/9522/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -412,8 +412,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
@@ -421,11 +421,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
-Sat Oct 15 03:20:41 UTC 2005
+Mon Oct 17 03:20:05 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -495,14 +495,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Oct 15 03:20:46 UTC 2005
+Mon Oct 17 03:20:10 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
-c: c
 dsh: Process terminated (before write).
-a: a
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -608,7 +608,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Oct 15 12:20:56 JST 2005
-pbuilder-time-stamp: 1129346456
+Current time: Mon Oct 17 12:20:12 JST 2005
+pbuilder-time-stamp: 1129519212
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/28812 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/9522 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sarge.log b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
index 59855b4..edda927 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sarge.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
@@ -8,14 +8,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -31,10 +31,10 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Oct 15 12:10:59 JST 2005
-pbuilder-time-stamp: 1129345859
+Current time: Mon Oct 17 12:12:24 JST 2005
+pbuilder-time-stamp: 1129518744
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -102,7 +102,7 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/17524/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/32049/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -423,7 +423,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
-Sat Oct 15 03:11:32 UTC 2005
+Mon Oct 17 03:12:57 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
@@ -436,6 +436,18 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -450,12 +462,6 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -487,14 +493,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
-Sat Oct 15 03:11:37 UTC 2005
+Mon Oct 17 03:13:02 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
-c: c
 dsh: Process terminated (before write).
-a: a
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -600,7 +606,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Oct 15 12:11:39 JST 2005
-pbuilder-time-stamp: 1129345899
+Current time: Mon Oct 17 12:13:03 JST 2005
+pbuilder-time-stamp: 1129518783
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/17524 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/32049 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index d977a91..77f017a 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sid.log
@@ -8,14 +8,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -31,10 +31,10 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Oct 15 12:06:12 JST 2005
-pbuilder-time-stamp: 1129345572
+Current time: Mon Oct 17 12:05:48 JST 2005
+pbuilder-time-stamp: 1129518348
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -105,7 +105,7 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/14190/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/22843/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -389,6 +389,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
@@ -423,11 +424,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
-Sat Oct 15 03:06:45 UTC 2005
+Mon Oct 17 03:06:21 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -497,14 +498,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
-Sat Oct 15 03:06:50 UTC 2005
+Mon Oct 17 03:06:26 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
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -610,7 +611,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Oct 15 12:06:52 JST 2005
-pbuilder-time-stamp: 1129345612
+Current time: Mon Oct 17 12:06:28 JST 2005
+pbuilder-time-stamp: 1129518388
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/14190 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.l2k7SQ/dir2/22843 and its subdirectories