testsuite update

author: dancer <dancer> 2006-01-19 08:38:15 +0000
committer: dancer <dancer> 2006-01-19 08:38:15 +0000
commit: e2886efd0f337666d8444849e518d0670abe0284 (patch)
tree: 461f3c8af1c4426969a793a3d2e40a543de28e6d /testsuite/normal
parent: c0e0d9a6f0f47dcab1c16fcd6f7e781f38c75f5d (diff)
download: pbuilder-e2886efd0f337666d8444849e518d0670abe0284.tar
pbuilder-e2886efd0f337666d8444849e518d0670abe0284.tar.gz
20 files changed, 789 insertions, 744 deletions
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index adb43c5..cd84abf 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Jan 13 12:18:36 JST 2006
-pbuilder-time-stamp: 1137122316
+Current time: Thu Jan 19 15:58:49 JST 2006
+pbuilder-time-stamp: 1137653929
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/24691/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/4847/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -37,12 +37,12 @@ The following NEW packages will be installed:
 Need to get 0B/2917kB of archives.
 After unpacking 9617kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11903 files and directories currently installed.)
+(Reading database ... 11906 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
 Selecting previously deselected package debconf-utils.
-Unpacking debconf-utils (from .../debconf-utils_1.4.66_all.deb) ...
+Unpacking debconf-utils (from .../debconf-utils_1.4.67_all.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
@@ -60,7 +60,7 @@ Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_amd64.deb) ...
 Setting up libmagic1 (4.15-2) ...
 
 Setting up file (4.15-2) ...
-Setting up debconf-utils (1.4.66) ...
+Setting up debconf-utils (1.4.67) ...
 
 Setting up html2text (1.3.2a-3) ...
 
@@ -81,17 +81,17 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12499 files and directories currently installed.)
+(Reading database ... 12502 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.6_amd64.deb) ...
 Setting up fakeroot (1.5.6) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/24691/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/24691/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/4847/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/4847/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -412,7 +412,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Jan 13 03:19:31 UTC 2006
+Thu Jan 19 06:59:34 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,13 +482,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Jan 13 03:19:36 UTC 2006
+Thu Jan 19 06:59:39 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-b: b
 dsh: Process terminated (before write).
+b: b
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -611,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: Fri Jan 13 12:19:39 JST 2006
-pbuilder-time-stamp: 1137122379
+Current time: Thu Jan 19 15:59:41 JST 2006
+pbuilder-time-stamp: 1137653981
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/24691 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/4847 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sarge.log b/testsuite/normal/pbuilder-build-dsh-sarge.log
index 8e7d377..6adc9dd 100644
--- a/testsuite/normal/pbuilder-build-dsh-sarge.log
+++ b/testsuite/normal/pbuilder-build-dsh-sarge.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Jan 13 12:08:28 JST 2006
-pbuilder-time-stamp: 1137121708
+Current time: Thu Jan 19 12:09:12 JST 2006
+pbuilder-time-stamp: 1137640152
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/13074/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/32444/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -86,12 +86,12 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/13074/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/13074/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/32444/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/32444/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -394,8 +394,8 @@ success
 success
 success
 success
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
@@ -409,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Jan 13 03:09:10 UTC 2006
+Thu Jan 19 03:09:55 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -479,14 +479,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Jan 13 03:09:15 UTC 2006
+Thu Jan 19 03:10:00 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 b: b
-c: c
 dsh: Process terminated (before write).
 a: a
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -592,7 +592,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Jan 13 12:09:17 JST 2006
-pbuilder-time-stamp: 1137121757
+Current time: Thu Jan 19 12:10:02 JST 2006
+pbuilder-time-stamp: 1137640202
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/13074 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/32444 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 80af781..55331ee 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Jan 13 12:02:32 JST 2006
-pbuilder-time-stamp: 1137121352
+Current time: Thu Jan 19 12:03:19 JST 2006
+pbuilder-time-stamp: 1137639799
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/10355/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/2135/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -34,10 +34,12 @@ 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 0B/2914kB of archives.
-After unpacking 9630kB of additional disk space will be used.
+Need to get 505kB/2914kB of archives.
+After unpacking 9622kB of additional disk space will be used.
+Get:1 http://ftp.jp.debian.org sid/main debhelper 5.0.17 [505kB]
+Fetched 505kB in 0s (689kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11191 files and directories currently installed.)
+(Reading database ... 11195 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -52,7 +54,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.2_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.15_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.17_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -68,7 +70,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.2) ...
-Setting up debhelper (5.0.15) ...
+Setting up debhelper (5.0.17) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -81,17 +83,18 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11789 files and directories currently installed.)
+(Reading database ... 11791 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.6_amd64.deb) ...
 Setting up fakeroot (1.5.6) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/10355/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/10355/etc/group
+ -> new cache content debhelper_5.0.17_all.deb added
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/2135/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/2135/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -397,10 +400,10 @@ success
 success
 success
 success
-b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+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
@@ -412,7 +415,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
-Fri Jan 13 03:03:26 UTC 2006
+Thu Jan 19 03:04:10 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,14 +485,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
-Fri Jan 13 03:03:31 UTC 2006
+Thu Jan 19 03:04:15 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -611,7 +614,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: Fri Jan 13 12:03:34 JST 2006
-pbuilder-time-stamp: 1137121414
+Current time: Thu Jan 19 12:04:17 JST 2006
+pbuilder-time-stamp: 1137639857
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir1/10355 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir1/2135 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 8a0cf1c..cc897b4 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -4,6 +4,9 @@ Building the build environment
 /usr/sbin/debootstrap
 I: Retrieving Release
 I: Retrieving Packages
+W: Retrying failed download of http://ftp.jp.debian.org/debian-amd64/debian/dists/etch/main/binary-amd64/Packages.bz2
+W: Retrying failed download of http://ftp.jp.debian.org/debian-amd64/debian/dists/etch/main/binary-amd64/Packages.bz2
+W: Retrying failed download of http://ftp.jp.debian.org/debian-amd64/debian/dists/etch/main/binary-amd64/Packages.bz2
 I: Validating Packages
 I: Resolving dependencies of required packages...
 I: Resolving dependencies of base packages...
@@ -559,13 +562,13 @@ I: Base system installed successfully.
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//14399/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//28814/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
 Hit http://ftp.jp.debian.org etch Release
 Hit http://ftp.jp.debian.org etch/main Packages
-Fetched 189B in 0s (1667B/s)
+Fetched 189B in 0s (1934B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -593,7 +596,7 @@ The following NEW packages will be installed:
 Need to get 0B/20.9MB of archives.
 After unpacking 82.9MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 7517 files and directories currently installed.)
+(Reading database ... 7520 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20051214-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-5_amd64.deb) ...
@@ -650,6 +653,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.fUr6UL/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//14399 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//28814 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sarge.log b/testsuite/normal/pbuilder-create-sarge.log
index 2d5461d..93c9640 100644
--- a/testsuite/normal/pbuilder-create-sarge.log
+++ b/testsuite/normal/pbuilder-create-sarge.log
@@ -324,12 +324,12 @@ I: Base system installed successfully.
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//1762/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//23637/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Hit http://ftp.jp.debian.org sarge/main Packages
 Get:1 http://ftp.jp.debian.org sarge/main Release [110B]
-Fetched 110B in 0s (2224B/s)
+Fetched 110B in 0s (2104B/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -412,6 +412,6 @@ Setting up build-essential (10.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//1762 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23637 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index f1f9df6..104410f 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -395,7 +395,6 @@ I: Configuring e2fsprogs...
 I: Configuring liblocale-gettext-perl...
 I: Configuring diff...
 I: Configuring libselinux1...
-I: Configuring util-linux...
 I: Configuring libstdc++6...
 I: Configuring libtext-charwidth-perl...
 I: Configuring libtext-wrapi18n-perl...
@@ -416,6 +415,7 @@ I: Configuring bash...
 I: Configuring login...
 I: Configuring lsb-base...
 I: Configuring passwd...
+I: Configuring util-linux...
 I: Configuring initscripts...
 I: Configuring sysvinit...
 I: Configuring debconf-i18n...
@@ -547,13 +547,13 @@ I: Base system installed successfully.
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//32628/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//26646/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 189B in 0s (2354B/s)
+Fetched 189B in 0s (963B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -569,8 +569,8 @@ The following extra packages will be installed:
 Suggested packages:
   binutils-doc cpp-doc gcc-4.0-locales debian-keyring gcc-4.0-doc lib32stdc++6
   manpages-dev autoconf automake1.9 libtool flex bison gdb gcc-doc
-  libc6-dev-i386 ia32-libs-dev lib32gcc1 glibc-doc libstdc++6-4.0-doc
-  stl-manual libterm-readline-gnu-perl libterm-readline-perl-perl
+  ia32-libs-dev lib32gcc1 glibc-doc libstdc++6-4.0-doc stl-manual
+  libterm-readline-gnu-perl libterm-readline-perl-perl
 Recommended packages:
   bzip2 libmudflap0-dev perl-doc
 The following NEW packages will be installed:
@@ -579,12 +579,12 @@ The following NEW packages will be installed:
   perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
 Need to get 0B/20.9MB of archives.
-After unpacking 82.9MB of additional disk space will be used.
+After unpacking 82.8MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 6808 files and directories currently installed.)
+(Reading database ... 6812 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20051214-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
-Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-6_amd64.deb) ...
+Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-7_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package perl-modules.
@@ -596,48 +596,51 @@ Unpacking patch (from .../patch_2.5.9-2_amd64.deb) ...
 Selecting previously deselected package make.
 Unpacking make (from .../make_3.80+3.81.b4-1_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
-Unpacking dpkg-dev (from .../dpkg-dev_1.13.11_all.deb) ...
+Unpacking dpkg-dev (from .../dpkg-dev_1.13.11.1_all.deb) ...
 Selecting previously deselected package gcc-4.0.
-Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-6_amd64.deb) ...
+Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-7_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.0.2-2_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-11_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.3.5-12_amd64.deb) ...
 Selecting previously deselected package libstdc++6-4.0-dev.
-Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-6_amd64.deb) ...
+Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-7_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
-Unpacking g++-4.0 (from .../g++-4.0_4.0.2-6_amd64.deb) ...
+Unpacking g++-4.0 (from .../g++-4.0_4.0.2-7_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.1_amd64.deb) ...
 Setting up binutils (2.16.1cvs20051214-1) ...
 
-Setting up cpp-4.0 (4.0.2-6) ...
+Setting up cpp-4.0 (4.0.2-7) ...
 Setting up cpp (4.0.2-2) ...
 
 Setting up patch (2.5.9-2) ...
 Setting up make (3.80+3.81.b4-1) ...
 
-Setting up gcc-4.0 (4.0.2-6) ...
+Setting up gcc-4.0 (4.0.2-7) ...
 Setting up gcc (4.0.2-2) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
-Setting up libc6-dev (2.3.5-11) ...
+Setting up libc6-dev (2.3.5-12) ...
 Setting up perl-modules (5.8.7-10) ...
-Setting up libstdc++6-4.0-dev (4.0.2-6) ...
+Setting up libstdc++6-4.0-dev (4.0.2-7) ...
 Setting up perl (5.8.7-10) ...
 
-Setting up dpkg-dev (1.13.11) ...
-Setting up g++-4.0 (4.0.2-6) ...
+Setting up dpkg-dev (1.13.11.1) ...
+Setting up g++-4.0 (4.0.2-7) ...
 Setting up g++ (4.0.2-2) ...
 
 Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
+ -> new cache content bsdutils_1%3a2.12r-4_amd64.deb added
+ -> new cache content mount_2.12r-4_amd64.deb added
+ -> new cache content util-linux_2.12r-4_amd64.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//32628 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26646 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 9f06472..7baa7d8 100644
--- a/testsuite/normal/pbuilder-execute-etch.log
+++ b/testsuite/normal/pbuilder-execute-etch.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//14836/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//25311/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//14836 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//25311 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sarge.log b/testsuite/normal/pbuilder-execute-sarge.log
index c58b16c..42a9c83 100644
--- a/testsuite/normal/pbuilder-execute-sarge.log
+++ b/testsuite/normal/pbuilder-execute-sarge.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//3079/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//20575/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//3079 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//20575 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index f67bfa4..b184167 100644
--- a/testsuite/normal/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//348/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//22729/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//348 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//22729 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index 5dad160..7f723b7 100644
--- a/testsuite/normal/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//18457/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//27997/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -16,8 +16,8 @@ Get:2 http://ftp.jp.debian.org experimental Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org experimental/main Packages [122kB]
-Fetched 126kB in 1s (101kB/s)
+Get:4 http://ftp.jp.debian.org experimental/main Packages [126kB]
+Fetched 131kB in 1s (101kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -27,34 +27,36 @@ The following packages will be REMOVED:
   libnewt0.51
 The following NEW packages will be installed:
   gcc-4.1-base libnewt0.52
+The following packages have been kept back:
+  apt apt-utils
 The following packages will be upgraded:
-  aptitude console-data diff initscripts libgcc1 libstdc++6 sysv-rc sysvinit
-  whiptail
-9 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/5051kB of archives.
-After unpacking 1757kB of additional disk space will be used.
-(Reading database ... 11906 files and directories currently installed.)
+  aptitude console-data diff gettext-base initscripts libgcc1 libstdc++6
+  sysv-rc sysvinit whiptail
+10 upgraded, 2 newly installed, 1 to remove and 2 not upgraded.
+Need to get 0B/5157kB of archives.
+After unpacking 1810kB of additional disk space will be used.
+(Reading database ... 11910 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.1-3_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 11905 files and directories currently installed.)
+(Reading database ... 11909 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 11840 files and directories currently installed.)
+(Reading database ... 11844 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.1-3_amd64.deb) ...
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
-(Reading database ... 11918 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-6 (using .../sysvinit_2.86.ds1-9_amd64.deb) ...
+(Reading database ... 11922 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-6 (using .../sysvinit_2.86.ds1-10_amd64.deb) ...
 Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-9) ...
+Setting up sysvinit (2.86.ds1-10) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11919 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-6 (using .../initscripts_2.86.ds1-9_amd64.deb) ...
+(Reading database ... 11923 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-6 (using .../initscripts_2.86.ds1-10_amd64.deb) ...
+Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
 Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-9) ...
-Installing new version of config file /etc/init.d/bootclean.sh ...
+Setting up initscripts (2.86.ds1-10) ...
 Installing new version of config file /etc/init.d/bootlogd ...
 Installing new version of config file /etc/init.d/bootmisc.sh ...
 Installing new version of config file /etc/init.d/checkfs.sh ...
@@ -75,26 +77,28 @@ Installing new version of config file /etc/init.d/urandom ...
 Installing new version of config file /etc/default/tmpfs ...
 
 Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 11929 files and directories currently installed.)
+(Reading database ... 11936 files and directories currently installed.)
 Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1-0exp6_amd64.deb) ...
-Preparing to replace libgcc1 1:4.0.2-6 (using .../libgcc1_1%3a4.1-0exp6_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.2-7 (using .../libgcc1_1%3a4.1-0exp6_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.1-base (4.1-0exp6) ...
 Setting up libgcc1 (4.1-0exp6) ...
 
-(Reading database ... 11935 files and directories currently installed.)
-Preparing to replace libstdc++6 4.0.2-6 (using .../libstdc++6_4.1-0exp6_amd64.deb) ...
+(Reading database ... 11942 files and directories currently installed.)
+Preparing to replace libstdc++6 4.0.2-7 (using .../libstdc++6_4.1-0exp6_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.1-0exp6) ...
 
-(Reading database ... 11935 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-6 (using .../sysv-rc_2.86.ds1-9_all.deb) ...
+(Reading database ... 11942 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-6 (using .../sysv-rc_2.86.ds1-10_all.deb) ...
 Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-9) ...
+Setting up sysv-rc (2.86.ds1-10) ...
 
-(Reading database ... 11943 files and directories currently installed.)
+(Reading database ... 11951 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
+Preparing to replace gettext-base 0.14.5-2 (using .../gettext-base_0.14.5-2.csharp.1_amd64.deb) ...
+Unpacking replacement gettext-base ...
 Preparing to replace console-data 2002.12.04dbs-52.1 (using .../console-data_20051214_all.deb) ...
 Unpacking replacement console-data ...
 Setting up libnewt0.52 (0.52.1-3) ...
@@ -102,6 +106,8 @@ Setting up libnewt0.52 (0.52.1-3) ...
 Setting up whiptail (0.52.1-3) ...
 Setting up aptitude (0.4.1-1experimental1) ...
 
+Setting up gettext-base (0.14.5-2.csharp.1) ...
+
 Setting up console-data (20051214) ...
 Looking for keymap to install:
 NONE
@@ -110,8 +116,29 @@ Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
 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.
+The following extra packages will be installed:
+  apt-utils
+Suggested packages:
+  apt-doc bzip2
+The following packages will be REMOVED:
+  aptitude tasksel
+The following packages will be upgraded:
+  apt apt-utils
+2 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0B/1501kB of archives.
+After unpacking 9404kB disk space will be freed.
+(Reading database ... 11922 files and directories currently installed.)
+Removing tasksel ...
+Removing aptitude ...
+(Reading database ... 11732 files and directories currently installed.)
+Preparing to replace apt-utils 0.6.43.1 (using .../apt-utils_0.6.43.2exp1_amd64.deb) ...
+Unpacking replacement apt-utils ...
+Preparing to replace apt 0.6.43.1 (using .../apt_0.6.43.2exp1_amd64.deb) ...
+Unpacking replacement apt ...
+Setting up apt (0.6.43.2exp1) ...
+
+Setting up apt-utils (0.6.43.2exp1) ...
+
 Copying back the cached apt archive contents
 umount: /sys: not mounted
 umount: /run: not found
@@ -119,9 +146,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//18457/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//27997/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//18457 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//27997 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index aaeb349..5b292d4 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//16248/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//26220/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -12,108 +12,99 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5722B]
-Get:3 http://ftp.jp.debian.org sid/main Packages [3880kB]
-Fetched 3886kB in 2s (1792kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3894kB]
+Fetched 3900kB in 2s (1828kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
-  base-config bash bsdutils console-data coreutils cpp-4.0 debconf
-  debconf-i18n dpkg-dev e2fslibs e2fsprogs findutils g++-4.0 gcc-4.0
-  gcc-4.0-base initscripts libblkid1 libc6 libc6-dev libcomerr2 libgcc1
-  libsasl2 libselinux1 libss2 libstdc++6 libstdc++6-4.0-dev libuuid1 login
-  lsb-base mount nano passwd procps sed sysv-rc sysvinit util-linux
-37 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/24.5MB of archives.
-After unpacking 111kB disk space will be freed.
-(Reading database ... 11903 files and directories currently installed.)
+  base-config bash bsdutils console-data coreutils cpp-4.0 dpkg-dev e2fslibs
+  e2fsprogs g++-4.0 gcc-4.0 gcc-4.0-base initscripts klogd libblkid1
+  libbz2-1.0 libc6 libc6-dev libcomerr2 libgcc1 liblzo1 libsasl2 libss2
+  libstdc++6 libstdc++6-4.0-dev libuuid1 login lsb-base mount passwd procps
+  sed sysklogd sysv-rc sysvinit util-linux
+36 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/23.5MB of archives.
+After unpacking 258kB disk space will be freed.
+(Reading database ... 11906 files and directories currently installed.)
 Preparing to replace bash 3.1-1 (using .../archives/bash_3.1-2_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1-2) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 11903 files and directories currently installed.)
-Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-2_amd64.deb) ...
+(Reading database ... 11906 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-4_amd64.deb) ...
 Unpacking replacement bsdutils ...
-Setting up bsdutils (2.12r-2) ...
+Setting up bsdutils (2.12r-4) ...
 
-(Reading database ... 11903 files and directories currently installed.)
+(Reading database ... 11906 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-5_amd64.deb) ...
 Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 No diversion `any diversion of /usr/bin/md5sum.textutils', none removed
 Unpacking replacement coreutils ...
 Setting up coreutils (5.93-5) ...
 
-(Reading database ... 11918 files and directories currently installed.)
-Preparing to replace libc6-dev 2.3.5-8.1 (using .../libc6-dev_2.3.5-11_amd64.deb) ...
+(Reading database ... 11921 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.5-8.1 (using .../libc6-dev_2.3.5-12_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.5-8.1 (using .../libc6_2.3.5-11_amd64.deb) ...
+Preparing to replace libc6 2.3.5-8.1 (using .../libc6_2.3.5-12_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.3.5-11) ...
+Setting up libc6 (2.3.5-12) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 Current default timezone: 'UTC'.
-Local time is now:      Fri Jan 13 03:23:21 UTC 2006.
-Universal Time is now:  Fri Jan 13 03:23:21 UTC 2006.
+Local time is now:      Thu Jan 19 07:02:44 UTC 2006.
+Universal Time is now:  Thu Jan 19 07:02:44 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11918 files and directories currently installed.)
+(Reading database ... 11921 files and directories currently installed.)
 Preparing to replace e2fslibs 1.38+1.39-WIP-2005.12.10-1 (using .../e2fslibs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11918 files and directories currently installed.)
+(Reading database ... 11921 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.38+1.39-WIP-2005.12.10-1 (using .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Replacing files in old package libuuid1 ...
 Replacing files in old package libblkid1 ...
 Setting up e2fsprogs (1.38+1.39-WIP-2005.12.31-1) ...
-(Reading database ... 11918 files and directories currently installed.)
-Preparing to replace findutils 4.2.26-2 (using .../findutils_4.2.27-1_amd64.deb) ...
-Unpacking replacement findutils ...
-Setting up findutils (4.2.27-1) ...
-Installing new version of config file /etc/updatedb.conf ...
-
-(Reading database ... 11918 files and directories currently installed.)
-Preparing to replace login 1:4.0.13-7 (using .../login_1%3a4.0.14-2_amd64.deb) ...
+(Reading database ... 11921 files and directories currently installed.)
+Preparing to replace login 1:4.0.13-7 (using .../login_1%3a4.0.14-3_amd64.deb) ...
 Unpacking replacement login ...
-Setting up login (4.0.14-2) ...
+Setting up login (4.0.14-3) ...
 
-(Reading database ... 11949 files and directories currently installed.)
-Preparing to replace mount 2.12p-8 (using .../mount_2.12r-2_amd64.deb) ...
+(Reading database ... 11954 files and directories currently installed.)
+Preparing to replace mount 2.12p-8 (using .../mount_2.12r-4_amd64.deb) ...
 Unpacking replacement mount ...
-Setting up mount (2.12r-2) ...
+Setting up mount (2.12r-4) ...
 
-(Reading database ... 11949 files and directories currently installed.)
+(Reading database ... 11954 files and directories currently installed.)
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-5_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-5) ...
 
-(Reading database ... 11950 files and directories currently installed.)
+(Reading database ... 11955 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-6) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11950 files and directories currently installed.)
-Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-2_amd64.deb) ...
+(Reading database ... 11955 files and directories currently installed.)
+Preparing to replace lsb-base 3.0-13 (using .../lsb-base_3.0-14_all.deb) ...
+Unpacking replacement lsb-base ...
+Setting up lsb-base (3.0-14) ...
+(Reading database ... 11955 files and directories currently installed.)
+Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-4_amd64.deb) ...
 Unpacking replacement util-linux ...
-Setting up util-linux (2.12r-2) ...
+Setting up util-linux (2.12r-4) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11950 files and directories currently installed.)
-Preparing to replace debconf-i18n 1.4.66 (using .../debconf-i18n_1.4.67_all.deb) ...
-Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.4.66 (using .../debconf_1.4.67_all.deb) ...
-Unpacking replacement debconf ...
-Preparing to replace lsb-base 3.0-13 (using .../lsb-base_3.0-14_all.deb) ...
-Unpacking replacement lsb-base ...
+(Reading database ... 11955 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement initscripts ...
-Setting up lsb-base (3.0-14) ...
 Setting up initscripts (2.86.ds1-6) ...
 Installing new version of config file /etc/init.d/bootclean.sh ...
 Installing new version of config file /etc/init.d/bootlogd ...
@@ -134,65 +125,66 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/umountroot ...
 Installing new version of config file /etc/init.d/urandom ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11956 files and directories currently installed.)
 Preparing to replace libblkid1 1.38+1.39-WIP-2005.12.10-1 (using .../libblkid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11956 files and directories currently installed.)
 Preparing to replace libcomerr2 1.38+1.39-WIP-2005.12.10-1 (using .../libcomerr2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11952 files and directories currently installed.)
-Preparing to replace cpp-4.0 4.0.2-5 (using .../cpp-4.0_4.0.2-6_amd64.deb) ...
+(Reading database ... 11956 files and directories currently installed.)
+Preparing to replace cpp-4.0 4.0.2-5 (using .../cpp-4.0_4.0.2-7_amd64.deb) ...
 Unpacking replacement cpp-4.0 ...
-Preparing to replace gcc-4.0-base 4.0.2-5 (using .../gcc-4.0-base_4.0.2-6_amd64.deb) ...
+Preparing to replace gcc-4.0-base 4.0.2-5 (using .../gcc-4.0-base_4.0.2-7_amd64.deb) ...
 Unpacking replacement gcc-4.0-base ...
-Preparing to replace libgcc1 1:4.0.2-5 (using .../libgcc1_1%3a4.0.2-6_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.2-5 (using .../libgcc1_1%3a4.0.2-7_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.0-base (4.0.2-6) ...
-Setting up libgcc1 (4.0.2-6) ...
+Setting up gcc-4.0-base (4.0.2-7) ...
+Setting up libgcc1 (4.0.2-7) ...
 
-(Reading database ... 11952 files and directories currently installed.)
-Preparing to replace gcc-4.0 4.0.2-5 (using .../gcc-4.0_4.0.2-6_amd64.deb) ...
+(Reading database ... 11956 files and directories currently installed.)
+Preparing to replace gcc-4.0 4.0.2-5 (using .../gcc-4.0_4.0.2-7_amd64.deb) ...
 Unpacking replacement gcc-4.0 ...
-Preparing to replace g++-4.0 4.0.2-5 (using .../g++-4.0_4.0.2-6_amd64.deb) ...
+Preparing to replace g++-4.0 4.0.2-5 (using .../g++-4.0_4.0.2-7_amd64.deb) ...
 Unpacking replacement g++-4.0 ...
-Preparing to replace libstdc++6-4.0-dev 4.0.2-5 (using .../libstdc++6-4.0-dev_4.0.2-6_amd64.deb) ...
+Preparing to replace libstdc++6-4.0-dev 4.0.2-5 (using .../libstdc++6-4.0-dev_4.0.2-7_amd64.deb) ...
 Unpacking replacement libstdc++6-4.0-dev ...
-Preparing to replace libstdc++6 4.0.2-5 (using .../libstdc++6_4.0.2-6_amd64.deb) ...
+Preparing to replace libstdc++6 4.0.2-5 (using .../libstdc++6_4.0.2-7_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.0.2-6) ...
-
-(Reading database ... 11946 files and directories currently installed.)
-Preparing to replace libselinux1 1.26-1 (using .../libselinux1_1.28-2_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.28-2) ...
+Setting up libstdc++6 (4.0.2-7) ...
 
-(Reading database ... 11946 files and directories currently installed.)
+(Reading database ... 11950 files and directories currently installed.)
 Preparing to replace libss2 1.38+1.39-WIP-2005.12.10-1 (using .../libss2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11946 files and directories currently installed.)
+(Reading database ... 11950 files and directories currently installed.)
 Preparing to replace libuuid1 1.38+1.39-WIP-2005.12.10-1 (using .../libuuid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11946 files and directories currently installed.)
+(Reading database ... 11950 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-6_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-6) ...
 
-(Reading database ... 11946 files and directories currently installed.)
+(Reading database ... 11950 files and directories currently installed.)
 Preparing to replace base-config 2.73 (using .../base-config_2.76_all.deb) ...
 Unpacking replacement base-config ...
+Preparing to replace sysklogd 1.4.1-17 (using .../sysklogd_1.4.1-17.1_amd64.deb) ...
+Unpacking replacement sysklogd ...
+Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
+Unpacking replacement klogd ...
+Preparing to replace libbz2-1.0 1.0.2-11 (using .../libbz2-1.0_1.0.3-2_amd64.deb) ...
+Unpacking replacement libbz2-1.0 ...
+Preparing to replace liblzo1 1.08-2 (using .../liblzo1_1.08-3_amd64.deb) ...
+Unpacking replacement liblzo1 ...
 Preparing to replace libsasl2 2.1.19-1.7 (using .../libsasl2_2.1.19-1.8_amd64.deb) ...
 Unpacking replacement libsasl2 ...
-Preparing to replace nano 1.3.8-2 (using .../nano_1.3.10-1_amd64.deb) ...
-Unpacking replacement nano ...
-Preparing to replace passwd 1:4.0.13-7 (using .../passwd_1%3a4.0.14-2_amd64.deb) ...
+Preparing to replace passwd 1:4.0.13-7 (using .../passwd_1%3a4.0.14-3_amd64.deb) ...
 Unpacking replacement passwd ...
 Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
@@ -200,31 +192,36 @@ Preparing to replace dpkg-dev 1.13.11 (using .../dpkg-dev_1.13.11.1_all.deb) ...
 Unpacking replacement dpkg-dev ...
 Preparing to replace console-data 2002.12.04dbs-52 (using .../console-data_2002.12.04dbs-52.1_all.deb) ...
 Unpacking replacement console-data ...
-Setting up libc6-dev (2.3.5-11) ...
-Setting up cpp-4.0 (4.0.2-6) ...
-Setting up gcc-4.0 (4.0.2-6) ...
+Setting up libc6-dev (2.3.5-12) ...
+Setting up cpp-4.0 (4.0.2-7) ...
+Setting up gcc-4.0 (4.0.2-7) ...
 Setting up base-config (2.76) ...
 
-Setting up libsasl2 (2.1.19-1.8) ...
+Setting up libbz2-1.0 (1.0.3-2) ...
 
-Setting up nano (1.3.10-1) ...
+Setting up liblzo1 (1.08-3) ...
 
-Setting up passwd (4.0.14-2) ...
+Setting up libsasl2 (2.1.19-1.8) ...
+
+Setting up passwd (4.0.14-3) ...
 
 Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
 
 Setting up dpkg-dev (1.13.11.1) ...
-Setting up g++-4.0 (4.0.2-6) ...
-Setting up debconf-i18n (1.4.67) ...
-Setting up libstdc++6-4.0-dev (4.0.2-6) ...
-Setting up debconf (1.4.67) ...
-
 Setting up console-data (2002.12.04dbs-52.1) ...
 Looking for keymap to install:
 NONE
 
+Setting up sysklogd (1.4.1-17.1) ...
+
+Setting up g++-4.0 (4.0.2-7) ...
+Setting up klogd (1.4.1-17.1) ...
+Installing new version of config file /etc/init.d/klogd ...
+Stopping kernel log daemon: klogd.
+
+Setting up libstdc++6-4.0-dev (4.0.2-7) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -241,9 +238,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//16248/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//26220/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//16248 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26220 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
index 84d3d8a..9ce4817 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//12704/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//27582/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,9 +18,9 @@ Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Ign http://ftp.jp.debian.org experimental Release
 Get:4 http://ftp.jp.debian.org sid Release [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [122kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [126kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 132kB in 0s (366kB/s)
+Fetched 137kB in 3s (41.1kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -33,37 +33,39 @@ The following packages will be REMOVED:
   libnewt0.51
 The following NEW packages will be installed:
   gcc-4.1-base libnewt0.52
+The following packages have been kept back:
+  apt apt-utils
 The following packages will be upgraded:
-  aptitude console-data diff initscripts libgcc1 libstdc++6 sysv-rc sysvinit
-  whiptail
-9 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/5051kB of archives.
-After unpacking 1757kB of additional disk space will be used.
+  aptitude console-data diff gettext-base initscripts libgcc1 libstdc++6
+  sysv-rc sysvinit whiptail
+10 upgraded, 2 newly installed, 1 to remove and 2 not upgraded.
+Need to get 0B/5157kB of archives.
+After unpacking 1810kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   whiptail libnewt0.52 diff sysvinit initscripts gcc-4.1-base libgcc1
-  libstdc++6 sysv-rc aptitude console-data
-(Reading database ... 12535 files and directories currently installed.)
+  libstdc++6 sysv-rc aptitude gettext-base console-data
+(Reading database ... 12541 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.1-3_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 12534 files and directories currently installed.)
+(Reading database ... 12540 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 12469 files and directories currently installed.)
+(Reading database ... 12475 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.1-3_amd64.deb) ...
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
-(Reading database ... 12547 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-6 (using .../sysvinit_2.86.ds1-9_amd64.deb) ...
+(Reading database ... 12553 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-6 (using .../sysvinit_2.86.ds1-10_amd64.deb) ...
 Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-9) ...
+Setting up sysvinit (2.86.ds1-10) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12548 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-6 (using .../initscripts_2.86.ds1-9_amd64.deb) ...
+(Reading database ... 12554 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-6 (using .../initscripts_2.86.ds1-10_amd64.deb) ...
+Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
 Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-9) ...
-Installing new version of config file /etc/init.d/bootclean.sh ...
+Setting up initscripts (2.86.ds1-10) ...
 Installing new version of config file /etc/init.d/bootlogd ...
 Installing new version of config file /etc/init.d/bootmisc.sh ...
 Installing new version of config file /etc/init.d/checkfs.sh ...
@@ -84,26 +86,28 @@ Installing new version of config file /etc/init.d/urandom ...
 Installing new version of config file /etc/default/tmpfs ...
 
 Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 12558 files and directories currently installed.)
+(Reading database ... 12567 files and directories currently installed.)
 Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1-0exp6_amd64.deb) ...
-Preparing to replace libgcc1 1:4.0.2-6 (using .../libgcc1_1%3a4.1-0exp6_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.2-7 (using .../libgcc1_1%3a4.1-0exp6_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.1-base (4.1-0exp6) ...
 Setting up libgcc1 (4.1-0exp6) ...
 
-(Reading database ... 12564 files and directories currently installed.)
-Preparing to replace libstdc++6 4.0.2-6 (using .../libstdc++6_4.1-0exp6_amd64.deb) ...
+(Reading database ... 12573 files and directories currently installed.)
+Preparing to replace libstdc++6 4.0.2-7 (using .../libstdc++6_4.1-0exp6_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.1-0exp6) ...
 
-(Reading database ... 12564 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-6 (using .../sysv-rc_2.86.ds1-9_all.deb) ...
+(Reading database ... 12573 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-6 (using .../sysv-rc_2.86.ds1-10_all.deb) ...
 Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-9) ...
+Setting up sysv-rc (2.86.ds1-10) ...
 
-(Reading database ... 12572 files and directories currently installed.)
+(Reading database ... 12582 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
+Preparing to replace gettext-base 0.14.5-2 (using .../gettext-base_0.14.5-2.csharp.1_amd64.deb) ...
+Unpacking replacement gettext-base ...
 Preparing to replace console-data 2002.12.04dbs-52.1 (using .../console-data_20051214_all.deb) ...
 Unpacking replacement console-data ...
 Setting up libnewt0.52 (0.52.1-3) ...
@@ -111,6 +115,8 @@ Setting up libnewt0.52 (0.52.1-3) ...
 Setting up whiptail (0.52.1-3) ...
 Setting up aptitude (0.4.1-1experimental1) ...
 
+Setting up gettext-base (0.14.5-2.csharp.1) ...
+
 Setting up console-data (20051214) ...
 Looking for keymap to install:
 NONE
@@ -119,17 +125,40 @@ Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
 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.
+The following extra packages will be installed:
+  apt-utils
+Suggested packages:
+  apt-doc bzip2 gnupg
+The following packages will be REMOVED:
+  aptitude tasksel
+The following packages will be upgraded:
+  apt apt-utils
+2 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0B/1501kB of archives.
+After unpacking 9404kB disk space will be freed.
+WARNING: The following packages cannot be authenticated!
+  apt-utils apt
+(Reading database ... 12553 files and directories currently installed.)
+Removing tasksel ...
+Removing aptitude ...
+(Reading database ... 12363 files and directories currently installed.)
+Preparing to replace apt-utils 0.6.43.1 (using .../apt-utils_0.6.43.2exp1_amd64.deb) ...
+Unpacking replacement apt-utils ...
+Preparing to replace apt 0.6.43.1 (using .../apt_0.6.43.2exp1_amd64.deb) ...
+Unpacking replacement apt ...
+Setting up apt (0.6.43.2exp1) ...
+
+Setting up apt-utils (0.6.43.2exp1) ...
+
 Copying back the cached apt archive contents
 umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
-tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh: line 14: kill: (7737) - No such process
- -> user script /var/cache/pbuilder/build//12704/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh: line 14: kill: (24366) - No such process
+ -> user script /var/cache/pbuilder/build//27582/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//12704 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//27582 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid.log b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
index a857344..7d16dee 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//10193/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//25493/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -13,8 +13,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3880kB]
-Fetched 3886kB in 2s (1666kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3894kB]
+Fetched 3900kB in 38s (101kB/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
@@ -23,114 +23,99 @@ Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
-  at base-config bash bsdutils console-data coreutils cpp-3.3 cpp-4.0 debconf
-  debconf-i18n dpkg-dev e2fslibs e2fsprogs exim4 exim4-config findutils
-  g++-3.3 g++-4.0 gcc-3.3 gcc-3.3-base gcc-4.0 gcc-4.0-base initscripts
-  libblkid1 libc6 libc6-dev libcomerr2 libgcc1 liblockfile1 libselinux1 libss2
-  libstdc++5 libstdc++5-3.3-dev libstdc++6 libstdc++6-4.0-dev libtextwrap1
-  libuuid1 login lsb-base mount nano passwd procps psmisc sed sysv-rc sysvinit
-  util-linux
-48 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 426kB/31.0MB of archives.
-After unpacking 98.3kB disk space will be freed.
+  base-config bash bsdutils console-data coreutils cpp-3.3 cpp-4.0 dpkg-dev
+  e2fslibs e2fsprogs exim4 exim4-base exim4-config exim4-daemon-light g++-3.3
+  g++-4.0 gcc-3.3 gcc-3.3-base gcc-4.0 gcc-4.0-base initscripts klogd
+  libblkid1 libc6 libc6-dev libcomerr2 libgcc1 liblockfile1 liblzo1 libss2
+  libstdc++5 libstdc++5-3.3-dev libstdc++6 libstdc++6-4.0-dev libuuid1 login
+  lsb-base mount passwd procps psmisc sed sysklogd sysv-rc sysvinit util-linux
+46 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/31.2MB of archives.
+After unpacking 217kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
-  bash bsdutils coreutils libc6-dev libc6 e2fslibs e2fsprogs findutils login
-  mount sed sysvinit util-linux debconf-i18n debconf lsb-base initscripts
-  libblkid1 libcomerr2 cpp-4.0 gcc-4.0-base libgcc1 gcc-4.0 g++-4.0
-  libstdc++6-4.0-dev libstdc++6 libselinux1 libss2 libuuid1 sysv-rc
-  base-config nano passwd procps at dpkg-dev exim4 exim4-config liblockfile1
-  libtextwrap1 console-data g++-3.3 gcc-3.3 cpp-3.3 gcc-3.3-base libstdc++5
-  libstdc++5-3.3-dev psmisc
-Get:1 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.11.1 [163kB]
-Get:2 http://ftp.jp.debian.org sid/main exim4 4.60-2 [1574B]
-Get:3 http://ftp.jp.debian.org sid/main exim4-config 4.60-2 [261kB]
-Fetched 426kB in 0s (1183kB/s)
-(Reading database ... 12533 files and directories currently installed.)
+  bash bsdutils coreutils libc6-dev libc6 e2fslibs e2fsprogs login mount sed
+  sysvinit lsb-base util-linux initscripts libblkid1 libcomerr2 cpp-4.0
+  gcc-4.0-base libgcc1 gcc-4.0 g++-4.0 libstdc++6-4.0-dev libstdc++6 libss2
+  libuuid1 sysv-rc base-config sysklogd klogd liblzo1 passwd procps dpkg-dev
+  exim4-config exim4-base exim4-daemon-light exim4 liblockfile1 console-data
+  g++-3.3 gcc-3.3 cpp-3.3 gcc-3.3-base libstdc++5 libstdc++5-3.3-dev psmisc
+(Reading database ... 12536 files and directories currently installed.)
 Preparing to replace bash 3.1-1 (using .../archives/bash_3.1-2_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1-2) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 12533 files and directories currently installed.)
-Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-2_amd64.deb) ...
+(Reading database ... 12536 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-4_amd64.deb) ...
 Unpacking replacement bsdutils ...
-Setting up bsdutils (2.12r-2) ...
+Setting up bsdutils (2.12r-4) ...
 
-(Reading database ... 12533 files and directories currently installed.)
+(Reading database ... 12536 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-5_amd64.deb) ...
 Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 Removing `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Unpacking replacement coreutils ...
 Setting up coreutils (5.93-5) ...
 
-(Reading database ... 12547 files and directories currently installed.)
-Preparing to replace libc6-dev 2.3.5-8.1 (using .../libc6-dev_2.3.5-11_amd64.deb) ...
+(Reading database ... 12550 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.5-8.1 (using .../libc6-dev_2.3.5-12_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.5-8.1 (using .../libc6_2.3.5-11_amd64.deb) ...
+Preparing to replace libc6 2.3.5-8.1 (using .../libc6_2.3.5-12_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.3.5-11) ...
+Setting up libc6 (2.3.5-12) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 Current default timezone: 'UTC'.
-Local time is now:      Fri Jan 13 03:14:29 UTC 2006.
-Universal Time is now:  Fri Jan 13 03:14:29 UTC 2006.
+Local time is now:      Thu Jan 19 03:15:09 UTC 2006.
+Universal Time is now:  Thu Jan 19 03:15:09 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 12547 files and directories currently installed.)
+(Reading database ... 12550 files and directories currently installed.)
 Preparing to replace e2fslibs 1.38+1.39-WIP-2005.12.10-1 (using .../e2fslibs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 12547 files and directories currently installed.)
+(Reading database ... 12550 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.38+1.39-WIP-2005.12.10-1 (using .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Replacing files in old package libuuid1 ...
 Replacing files in old package libblkid1 ...
 Setting up e2fsprogs (1.38+1.39-WIP-2005.12.31-1) ...
-(Reading database ... 12547 files and directories currently installed.)
-Preparing to replace findutils 4.2.26-2 (using .../findutils_4.2.27-1_amd64.deb) ...
-Unpacking replacement findutils ...
-Setting up findutils (4.2.27-1) ...
-Installing new version of config file /etc/updatedb.conf ...
-
-(Reading database ... 12547 files and directories currently installed.)
-Preparing to replace login 1:4.0.13-7 (using .../login_1%3a4.0.14-2_amd64.deb) ...
+(Reading database ... 12550 files and directories currently installed.)
+Preparing to replace login 1:4.0.13-7 (using .../login_1%3a4.0.14-3_amd64.deb) ...
 Unpacking replacement login ...
-Setting up login (4.0.14-2) ...
+Setting up login (4.0.14-3) ...
 
-(Reading database ... 12578 files and directories currently installed.)
-Preparing to replace mount 2.12p-8 (using .../mount_2.12r-2_amd64.deb) ...
+(Reading database ... 12583 files and directories currently installed.)
+Preparing to replace mount 2.12p-8 (using .../mount_2.12r-4_amd64.deb) ...
 Unpacking replacement mount ...
-Setting up mount (2.12r-2) ...
+Setting up mount (2.12r-4) ...
 
-(Reading database ... 12578 files and directories currently installed.)
+(Reading database ... 12583 files and directories currently installed.)
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-5_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-5) ...
 
-(Reading database ... 12579 files and directories currently installed.)
+(Reading database ... 12584 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-6) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12579 files and directories currently installed.)
-Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-2_amd64.deb) ...
+(Reading database ... 12584 files and directories currently installed.)
+Preparing to replace lsb-base 3.0-13 (using .../lsb-base_3.0-14_all.deb) ...
+Unpacking replacement lsb-base ...
+Setting up lsb-base (3.0-14) ...
+(Reading database ... 12584 files and directories currently installed.)
+Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-4_amd64.deb) ...
 Unpacking replacement util-linux ...
-Setting up util-linux (2.12r-2) ...
+Setting up util-linux (2.12r-4) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 12579 files and directories currently installed.)
-Preparing to replace debconf-i18n 1.4.66 (using .../debconf-i18n_1.4.67_all.deb) ...
-Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.4.66 (using .../debconf_1.4.67_all.deb) ...
-Unpacking replacement debconf ...
-Preparing to replace lsb-base 3.0-13 (using .../lsb-base_3.0-14_all.deb) ...
-Unpacking replacement lsb-base ...
+(Reading database ... 12584 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement initscripts ...
-Setting up lsb-base (3.0-14) ...
 Setting up initscripts (2.86.ds1-6) ...
 Installing new version of config file /etc/init.d/bootclean.sh ...
 Installing new version of config file /etc/init.d/bootlogd ...
@@ -151,78 +136,78 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/umountroot ...
 Installing new version of config file /etc/init.d/urandom ...
 
-(Reading database ... 12581 files and directories currently installed.)
+(Reading database ... 12585 files and directories currently installed.)
 Preparing to replace libblkid1 1.38+1.39-WIP-2005.12.10-1 (using .../libblkid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 12581 files and directories currently installed.)
+(Reading database ... 12585 files and directories currently installed.)
 Preparing to replace libcomerr2 1.38+1.39-WIP-2005.12.10-1 (using .../libcomerr2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 12581 files and directories currently installed.)
-Preparing to replace cpp-4.0 4.0.2-5 (using .../cpp-4.0_4.0.2-6_amd64.deb) ...
+(Reading database ... 12585 files and directories currently installed.)
+Preparing to replace cpp-4.0 4.0.2-5 (using .../cpp-4.0_4.0.2-7_amd64.deb) ...
 Unpacking replacement cpp-4.0 ...
-Preparing to replace gcc-4.0-base 4.0.2-5 (using .../gcc-4.0-base_4.0.2-6_amd64.deb) ...
+Preparing to replace gcc-4.0-base 4.0.2-5 (using .../gcc-4.0-base_4.0.2-7_amd64.deb) ...
 Unpacking replacement gcc-4.0-base ...
-Preparing to replace libgcc1 1:4.0.2-5 (using .../libgcc1_1%3a4.0.2-6_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.2-5 (using .../libgcc1_1%3a4.0.2-7_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.0-base (4.0.2-6) ...
-Setting up libgcc1 (4.0.2-6) ...
+Setting up gcc-4.0-base (4.0.2-7) ...
+Setting up libgcc1 (4.0.2-7) ...
 
-(Reading database ... 12581 files and directories currently installed.)
-Preparing to replace gcc-4.0 4.0.2-5 (using .../gcc-4.0_4.0.2-6_amd64.deb) ...
+(Reading database ... 12585 files and directories currently installed.)
+Preparing to replace gcc-4.0 4.0.2-5 (using .../gcc-4.0_4.0.2-7_amd64.deb) ...
 Unpacking replacement gcc-4.0 ...
-Preparing to replace g++-4.0 4.0.2-5 (using .../g++-4.0_4.0.2-6_amd64.deb) ...
+Preparing to replace g++-4.0 4.0.2-5 (using .../g++-4.0_4.0.2-7_amd64.deb) ...
 Unpacking replacement g++-4.0 ...
-Preparing to replace libstdc++6-4.0-dev 4.0.2-5 (using .../libstdc++6-4.0-dev_4.0.2-6_amd64.deb) ...
+Preparing to replace libstdc++6-4.0-dev 4.0.2-5 (using .../libstdc++6-4.0-dev_4.0.2-7_amd64.deb) ...
 Unpacking replacement libstdc++6-4.0-dev ...
-Preparing to replace libstdc++6 4.0.2-5 (using .../libstdc++6_4.0.2-6_amd64.deb) ...
+Preparing to replace libstdc++6 4.0.2-5 (using .../libstdc++6_4.0.2-7_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.0.2-6) ...
-
-(Reading database ... 12575 files and directories currently installed.)
-Preparing to replace libselinux1 1.26-1 (using .../libselinux1_1.28-2_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.28-2) ...
+Setting up libstdc++6 (4.0.2-7) ...
 
-(Reading database ... 12575 files and directories currently installed.)
+(Reading database ... 12579 files and directories currently installed.)
 Preparing to replace libss2 1.38+1.39-WIP-2005.12.10-1 (using .../libss2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 12575 files and directories currently installed.)
+(Reading database ... 12579 files and directories currently installed.)
 Preparing to replace libuuid1 1.38+1.39-WIP-2005.12.10-1 (using .../libuuid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 12575 files and directories currently installed.)
+(Reading database ... 12579 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-6_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-6) ...
 
-(Reading database ... 12575 files and directories currently installed.)
+(Reading database ... 12579 files and directories currently installed.)
 Preparing to replace base-config 2.73 (using .../base-config_2.76_all.deb) ...
 Unpacking replacement base-config ...
-Preparing to replace nano 1.3.8-2 (using .../nano_1.3.10-1_amd64.deb) ...
-Unpacking replacement nano ...
-Preparing to replace passwd 1:4.0.13-7 (using .../passwd_1%3a4.0.14-2_amd64.deb) ...
+Preparing to replace sysklogd 1.4.1-17 (using .../sysklogd_1.4.1-17.1_amd64.deb) ...
+Unpacking replacement sysklogd ...
+Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
+Unpacking replacement klogd ...
+Preparing to replace liblzo1 1.08-2 (using .../liblzo1_1.08-3_amd64.deb) ...
+Unpacking replacement liblzo1 ...
+Preparing to replace passwd 1:4.0.13-7 (using .../passwd_1%3a4.0.14-3_amd64.deb) ...
 Unpacking replacement passwd ...
 Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace at 3.1.9 (using .../archives/at_3.1.10_amd64.deb) ...
-Unpacking replacement at ...
 Preparing to replace dpkg-dev 1.13.11 (using .../dpkg-dev_1.13.11.1_all.deb) ...
 Unpacking replacement dpkg-dev ...
-Preparing to replace exim4 4.60-1 (using .../archives/exim4_4.60-2_all.deb) ...
-Unpacking replacement exim4 ...
-Preparing to replace exim4-config 4.60-1 (using .../exim4-config_4.60-2_all.deb) ...
+Preparing to replace exim4-config 4.60-1 (using .../exim4-config_4.60-3_all.deb) ...
 Unpacking replacement exim4-config ...
+Preparing to replace exim4-base 4.60-1 (using .../exim4-base_4.60-3_amd64.deb) ...
+Unpacking replacement exim4-base ...
+Replacing files in old package exim4-daemon-light ...
+Preparing to replace exim4-daemon-light 4.60-1 (using .../exim4-daemon-light_4.60-3_amd64.deb) ...
+Unpacking replacement exim4-daemon-light ...
+Preparing to replace exim4 4.60-1 (using .../archives/exim4_4.60-3_all.deb) ...
+Unpacking replacement exim4 ...
 Preparing to replace liblockfile1 1.06 (using .../liblockfile1_1.06.1_amd64.deb) ...
 Unpacking replacement liblockfile1 ...
-Preparing to replace libtextwrap1 0.1-3 (using .../libtextwrap1_0.1-4_amd64.deb) ...
-Unpacking replacement libtextwrap1 ...
 Preparing to replace console-data 2002.12.04dbs-52 (using .../console-data_2002.12.04dbs-52.1_all.deb) ...
 Unpacking replacement console-data ...
 Preparing to replace g++-3.3 1:3.3.6-10 (using .../g++-3.3_1%3a3.3.6-12_amd64.deb) ...
@@ -237,44 +222,23 @@ Preparing to replace libstdc++5 1:3.3.6-10 (using .../libstdc++5_1%3a3.3.6-12_am
 Unpacking replacement libstdc++5 ...
 Preparing to replace libstdc++5-3.3-dev 1:3.3.6-10 (using .../libstdc++5-3.3-dev_1%3a3.3.6-12_amd64.deb) ...
 Unpacking replacement libstdc++5-3.3-dev ...
-Preparing to replace psmisc 21.8-1 (using .../psmisc_21.9-1_amd64.deb) ...
+Preparing to replace psmisc 21.8-1 (using .../psmisc_22.1-1_amd64.deb) ...
 Unpacking replacement psmisc ...
-Setting up libc6-dev (2.3.5-11) ...
-Setting up cpp-4.0 (4.0.2-6) ...
-Setting up gcc-4.0 (4.0.2-6) ...
+Setting up libc6-dev (2.3.5-12) ...
+Setting up cpp-4.0 (4.0.2-7) ...
+Setting up gcc-4.0 (4.0.2-7) ...
 Setting up base-config (2.76) ...
 
-Setting up nano (1.3.10-1) ...
+Setting up liblzo1 (1.08-3) ...
 
-Setting up passwd (4.0.14-2) ...
+Setting up passwd (4.0.14-3) ...
 
 Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
 
-Setting up at (3.1.10) ...
-Installing new version of config file /etc/init.d/atd ...
-
 Setting up dpkg-dev (1.13.11.1) ...
-Setting up exim4 (4.60-2) ...
-Setting up liblockfile1 (1.06.1) ...
-Setting up libtextwrap1 (0.1-4) ...
-
-Setting up gcc-3.3-base (3.3.6-12) ...
-Setting up cpp-3.3 (3.3.6-12) ...
-Setting up gcc-3.3 (3.3.6-12) ...
-Setting up libstdc++5 (3.3.6-12) ...
-
-Setting up psmisc (21.9-1) ...
-
-Setting up g++-3.3 (3.3.6-12) ...
-Setting up debconf-i18n (1.4.67) ...
-Setting up libstdc++6-4.0-dev (4.0.2-6) ...
-Setting up g++-4.0 (4.0.2-6) ...
-Setting up libstdc++5-3.3-dev (3.3.6-12) ...
-Setting up debconf (1.4.67) ...
-
-Setting up exim4-config (4.60-2) ...
+Setting up exim4-config (4.60-3) ...
 Installing new version of config file /etc/exim4/conf.d/router/400_exim4-config_system_aliases ...
 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 ...
@@ -283,10 +247,33 @@ Installing new version of config file /etc/exim4/conf.d/main/01_exim4-config_lis
 Installing new version of config file /etc/exim4/conf.d/transport/30_exim4-config_address_pipe ...
 Installing new version of config file /etc/exim4/exim4.conf.template ...
 
+Setting up exim4-base (4.60-3) ...
+
+Setting up exim4-daemon-light (4.60-3) ...
+
+Setting up exim4 (4.60-3) ...
+Setting up liblockfile1 (1.06.1) ...
 Setting up console-data (2002.12.04dbs-52.1) ...
 Looking for keymap to install:
 NONE
 
+Setting up gcc-3.3-base (3.3.6-12) ...
+Setting up cpp-3.3 (3.3.6-12) ...
+Setting up gcc-3.3 (3.3.6-12) ...
+Setting up libstdc++5 (3.3.6-12) ...
+
+Setting up psmisc (22.1-1) ...
+
+Setting up sysklogd (1.4.1-17.1) ...
+
+Setting up g++-3.3 (3.3.6-12) ...
+Setting up g++-4.0 (4.0.2-7) ...
+Setting up klogd (1.4.1-17.1) ...
+Installing new version of config file /etc/init.d/klogd ...
+Stopping kernel log daemon: klogd.
+
+Setting up libstdc++5-3.3-dev (3.3.6-12) ...
+Setting up libstdc++6-4.0-dev (4.0.2-7) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -294,17 +281,14 @@ 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 dpkg-dev_1.13.11.1_all.deb added
- -> new cache content exim4_4.60-2_all.deb added
- -> new cache content exim4-config_4.60-2_all.deb added
 umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
-tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh: line 14: kill: (7737) - No such process
- -> user script /var/cache/pbuilder/build//10193/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh: line 14: kill: (24366) - No such process
+ -> user script /var/cache/pbuilder/build//25493/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//10193 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//25493 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch.log b/testsuite/normal/pbuilder-update-sarge-etch.log
index 1c62b86..91e9481 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch.log
@@ -1,18 +1,18 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//4605/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//21482/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3595kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3598kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3595kB in 1s (1936kB/s)
+Fetched 3598kB in 1s (2142kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -41,8 +41,8 @@ The following packages will be upgraded:
   pppoeconf procps psmisc sysv-rc sysvinit tar tasksel telnet util-linux wget
   whiptail zlib1g
 119 upgraded, 18 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/64.2MB of archives.
-After unpacking 37.9MB of additional disk space will be used.
+Need to get 0B/64.3MB of archives.
+After unpacking 38.1MB of additional disk space will be used.
 (Reading database ... 10950 files and directories currently installed.)
 Preparing to replace linux-kernel-headers 2.5.999-test7-bk-17 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
 Unpacking replacement linux-kernel-headers ...
@@ -73,8 +73,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-8.1) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Fri Jan 13 03:12:53 UTC 2006.
-Universal Time is now:  Fri Jan 13 03:12:53 UTC 2006.
+Local time is now:      Thu Jan 19 03:12:54 UTC 2006.
+Universal Time is now:  Thu Jan 19 03:12:54 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11284 files and directories currently installed.)
@@ -140,9 +140,9 @@ Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38+1.39-WIP-2
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.38+1.39-WIP-2005.12.10-1) ...
 (Reading database ... 11303 files and directories currently installed.)
-Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.26-2_amd64.deb) ...
+Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.27-1_amd64.deb) ...
 Unpacking replacement findutils ...
-Setting up findutils (4.2.26-2) ...
+Setting up findutils (4.2.27-1) ...
 Installing new version of config file /etc/updatedb.conf ...
 
 (Reading database ... 11324 files and directories currently installed.)
@@ -162,22 +162,27 @@ Setting up hostname (2.91) ...
 Selecting previously deselected package libdb4.3.
 (Reading database ... 11323 files and directories currently installed.)
 Unpacking libdb4.3 (from .../libdb4.3_4.3.29-3_amd64.deb) ...
-Selecting previously deselected package libselinux1.
-Unpacking libselinux1 (from .../libselinux1_1.26-1_amd64.deb) ...
-Setting up libselinux1 (1.26-1) ...
+Selecting previously deselected package libsepol1.
+Unpacking libsepol1 (from .../libsepol1_1.10-1_amd64.deb) ...
+Setting up libsepol1 (1.10-1) ...
 
+Selecting previously deselected package libselinux1.
 (Reading database ... 11332 files and directories currently installed.)
+Unpacking libselinux1 (from .../libselinux1_1.28-2_amd64.deb) ...
+Setting up libselinux1 (1.28-2) ...
+
+(Reading database ... 11337 files and directories currently installed.)
 Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3_all.deb) ...
 Unpacking replacement libpam-runtime ...
 Setting up libpam-runtime (0.79-3) ...
 Installing new version of config file /etc/pam.conf ...
 
-(Reading database ... 11332 files and directories currently installed.)
+(Reading database ... 11337 files and directories currently installed.)
 Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3_amd64.deb) ...
 Unpacking replacement libpam0g ...
 Setting up libpam0g (0.79-3) ...
 
-(Reading database ... 11332 files and directories currently installed.)
+(Reading database ... 11337 files and directories currently installed.)
 Preparing to replace libpam-modules 0.76-22 (using .../libpam-modules_0.79-3_amd64.deb) ...
 Unpacking replacement libpam-modules ...
 Setting up libdb4.3 (4.3.29-3) ...
@@ -186,7 +191,7 @@ Installing new version of config file /etc/security/access.conf ...
 Installing new version of config file /etc/security/pam_env.conf ...
 Installing new version of config file /etc/security/limits.conf ...
 
-(Reading database ... 11336 files and directories currently installed.)
+(Reading database ... 11341 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.13-7_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-7) ...
@@ -194,16 +199,16 @@ 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 ... 11345 files and directories currently installed.)
+(Reading database ... 11350 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 ... 11345 files and directories currently installed.)
+(Reading database ... 11350 files and directories currently installed.)
 Preparing to replace ncurses-bin 5.4-4 (using .../ncurses-bin_5.5-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.5-1) ...
-(Reading database ... 11345 files and directories currently installed.)
+(Reading database ... 11350 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.4-8 (using .../perl-modules_5.8.7-10_all.deb) ...
 Unpacking replacement perl-modules ...
 Preparing to replace perl 5.8.4-8 (using .../perl_5.8.7-10_amd64.deb) ...
@@ -213,11 +218,6 @@ Unpacking replacement libperl5.8 ...
 Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.7-10_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.7-10) ...
-Selecting previously deselected package libsepol1.
-(Reading database ... 11854 files and directories currently installed.)
-Unpacking libsepol1 (from .../libsepol1_1.10-1_amd64.deb) ...
-Setting up libsepol1 (1.10-1) ...
-
 (Reading database ... 11859 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement sysvinit ...
@@ -288,9 +288,9 @@ Preparing to replace libtext-charwidth-perl 0.04-1 (using .../libtext-charwidth-
 Unpacking replacement libtext-charwidth-perl ...
 Preparing to replace libtext-wrapi18n-perl 0.06-1 (using .../libtext-wrapi18n-perl_0.06-4_all.deb) ...
 Unpacking replacement libtext-wrapi18n-perl ...
-Preparing to replace debconf-i18n 1.4.30.13 (using .../debconf-i18n_1.4.66_all.deb) ...
+Preparing to replace debconf-i18n 1.4.30.13 (using .../debconf-i18n_1.4.67_all.deb) ...
 Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.4.30.13 (using .../debconf_1.4.66_all.deb) ...
+Preparing to replace debconf 1.4.30.13 (using .../debconf_1.4.67_all.deb) ...
 Unpacking replacement debconf ...
 Preparing to replace console-data 2002.12.04dbs-49 (using .../console-data_2002.12.04dbs-52_all.deb) ...
 Unpacking replacement console-data ...
@@ -304,10 +304,10 @@ Setting up liblocale-gettext-perl (1.05-1) ...
 Setting up libtext-iconv-perl (1.4-2) ...
 Setting up libtext-charwidth-perl (0.04-3) ...
 Setting up libtext-wrapi18n-perl (0.06-4) ...
-Setting up debconf-i18n (1.4.66) ...
-Setting up debconf (1.4.66) ...
+Setting up debconf-i18n (1.4.67) ...
+Setting up debconf (1.4.67) ...
 
-(Reading database ... 11906 files and directories currently installed.)
+(Reading database ... 11907 files and directories currently installed.)
 Preparing to replace console-common 0.7.49 (using .../console-common_0.7.55_all.deb) ...
 Unpacking replacement console-common ...
 Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.0.2-5_amd64.deb) ...
@@ -315,14 +315,14 @@ Unpacking replacement libgcc1 ...
 Setting up libgcc1 (4.0.2-5) ...
 
 Selecting previously deselected package gcc-4.0-base.
-(Reading database ... 11912 files and directories currently installed.)
+(Reading database ... 11913 files and directories currently installed.)
 Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package libstdc++6.
 Unpacking libstdc++6 (from .../libstdc++6_4.0.2-5_amd64.deb) ...
 Setting up gcc-4.0-base (4.0.2-5) ...
 Setting up libstdc++6 (4.0.2-5) ...
 
-(Reading database ... 11924 files and directories currently installed.)
+(Reading database ... 11925 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.43.1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Selecting previously deselected package libncursesw5.
@@ -335,12 +335,12 @@ Preparing to replace apt 0.5.28.6 (using .../apt_0.6.43.1_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.43.1) ...
 
-(Reading database ... 11951 files and directories currently installed.)
+(Reading database ... 11952 files and directories currently installed.)
 Preparing to replace dselect 1.10.28 (using .../dselect_1.13.11_amd64.deb) ...
 Unpacking replacement dselect ...
 Setting up dselect (1.13.11) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 11951 files and directories currently installed.)
+(Reading database ... 11952 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement initscripts ...
 Setting up lsb-base (3.0-13) ...
@@ -364,7 +364,7 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/urandom ...
 Installing new version of config file /etc/default/tmpfs ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11953 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.25-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.34-1_amd64.deb) ...
@@ -373,27 +373,27 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.34-1) ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11953 files and directories currently installed.)
 Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38+1.39-WIP-2005.12.10-1) ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11953 files and directories currently installed.)
 Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38+1.39-WIP-2005.12.10-1) ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11953 files and directories currently installed.)
 Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38+1.39-WIP-2005.12.10-1) ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11953 files and directories currently installed.)
 Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38+1.39-WIP-2005.12.10-1) ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11953 files and directories currently installed.)
 Preparing to replace libgpg-error0 1.0-1 (using .../libgpg-error0_1.1-4_amd64.deb) ...
 Unpacking replacement libgpg-error0 ...
 Preparing to replace libgcrypt11 1.2.0-11.1 (using .../libgcrypt11_1.2.2-1_amd64.deb) ...
@@ -402,7 +402,7 @@ Preparing to replace zlib1g 1:1.2.2-4 (using .../zlib1g_1%3a1.2.3-9_amd64.deb) .
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-9) ...
 
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11953 files and directories currently installed.)
 Preparing to replace libopencdk8 0.5.5-10 (using .../libopencdk8_0.5.7-2_amd64.deb) ...
 Unpacking replacement libopencdk8 ...
 Preparing to replace libtasn1-2 0.2.10-3 (using .../libtasn1-2_0.2.17-1_amd64.deb) ...
@@ -437,12 +437,12 @@ Setting up passwd (4.0.13-7) ...
 Installing new version of config file /etc/pam.d/chfn ...
 Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 12019 files and directories currently installed.)
+(Reading database ... 12020 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-4_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-4) ...
 
-(Reading database ... 12019 files and directories currently installed.)
+(Reading database ... 12020 files and directories currently installed.)
 Preparing to replace binutils 2.15-6 (using .../binutils_2.16.1cvs20051214-1_amd64.deb) ...
 Unpacking replacement binutils ...
 Preparing to replace libstdc++5-3.3-dev 1:3.3.5-13 (using .../libstdc++5-3.3-dev_1%3a3.3.6-10_amd64.deb) ...
@@ -461,7 +461,7 @@ Setting up gcc-3.3-base (3.3.6-10) ...
 Setting up libstdc++5 (3.3.6-10) ...
 
 Selecting previously deselected package dmidecode.
-(Reading database ... 12038 files and directories currently installed.)
+(Reading database ... 12039 files and directories currently installed.)
 Unpacking dmidecode (from .../dmidecode_2.7-2_amd64.deb) ...
 Selecting previously deselected package laptop-detect.
 Unpacking laptop-detect (from .../laptop-detect_0.12.1_amd64.deb) ...
@@ -495,7 +495,7 @@ Preparing to replace manpages 1.70-1 (using .../manpages_2.17-1_all.deb) ...
 Unpacking replacement manpages ...
 Preparing to replace modutils 2.4.26-1.2 (using .../modutils_2.4.27.0-3_amd64.deb) ...
 Unpacking replacement modutils ...
-Preparing to replace nano 1.2.4-5 (using .../nano_1.3.8-2_amd64.deb) ...
+Preparing to replace nano 1.2.4-5 (using .../nano_1.3.10-1_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace net-tools 1.60-10 (using .../net-tools_1.60-17_amd64.deb) ...
 Unpacking replacement net-tools ...
@@ -509,7 +509,7 @@ Preparing to replace makedev 2.3.1-77 (using .../makedev_2.3.1-79_all.deb) ...
 Unpacking replacement makedev ...
 Preparing to replace procps 1:3.2.1-2 (using .../procps_1%3a3.2.5-1_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace at 3.1.8-11 (using .../archives/at_3.1.9_amd64.deb) ...
+Preparing to replace at 3.1.8-11 (using .../archives/at_3.1.10_amd64.deb) ...
 Stopping deferred execution scheduler: atd.
 Unpacking replacement at ...
 Selecting previously deselected package cpp-4.0.
@@ -533,7 +533,7 @@ Selecting previously deselected package g++-4.0.
 Unpacking g++-4.0 (from .../g++-4.0_4.0.2-5_amd64.deb) ...
 Preparing to replace g++ 4:3.3.5-3 (using .../g++_4%3a4.0.2-2_amd64.deb) ...
 Unpacking replacement g++ ...
-Preparing to replace libtextwrap1 0.1-1 (using .../libtextwrap1_0.1-3_amd64.deb) ...
+Preparing to replace libtextwrap1 0.1-1 (using .../libtextwrap1_0.1-4_amd64.deb) ...
 Unpacking replacement libtextwrap1 ...
 Preparing to replace mailx 1:8.1.2-0.20040524cvs-4 (using .../mailx_1%3a8.1.2-0.20050715cvs-1_amd64.deb) ...
 Unpacking replacement mailx ...
@@ -666,7 +666,7 @@ Installing new version of config file /etc/modutils/aliases ...
 Installing new version of config file /etc/modutils/actions ...
 Architecture-specific modutils configuration for x86_64 not found, using defaults
 
-Setting up nano (1.3.8-2) ...
+Setting up nano (1.3.10-1) ...
 Installing new version of config file /etc/nanorc ...
 
 Setting up net-tools (1.60-17) ...
@@ -683,7 +683,7 @@ Setting up procps (3.2.5-1) ...
 Installing new version of config file /etc/sysctl.conf ...
 Installing new version of config file /etc/init.d/procps.sh ...
 
-Setting up at (3.1.9) ...
+Setting up at (3.1.10) ...
 Installing new version of config file /etc/init.d/atd ...
 
 Setting up cpp-4.0 (4.0.2-5) ...
@@ -695,7 +695,7 @@ Setting up exim4 (4.60-1) ...
 Setting up gcc-4.0 (4.0.2-5) ...
 Setting up gcc (4.0.2-2) ...
 
-Setting up libtextwrap1 (0.1-3) ...
+Setting up libtextwrap1 (0.1-4) ...
 
 Setting up mailx (8.1.2-0.20050715cvs-1) ...
 
@@ -759,9 +759,9 @@ umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
- -> user script /var/cache/pbuilder/build//4605/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//21482/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//4605 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//21482 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index c712e0d..32b5a3f 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/7885/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/18861/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -24,7 +24,7 @@ The following NEW packages will be installed:
 Need to get 0B/135kB of archives.
 After unpacking 754kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11903 files and directories currently installed.)
+(Reading database ... 11906 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.36_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.36_amd64.deb) ...
@@ -59,12 +59,12 @@ The following NEW packages will be installed:
 Need to get 0B/2917kB of archives.
 After unpacking 9617kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11999 files and directories currently installed.)
+(Reading database ... 12002 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
 Selecting previously deselected package debconf-utils.
-Unpacking debconf-utils (from .../debconf-utils_1.4.66_all.deb) ...
+Unpacking debconf-utils (from .../debconf-utils_1.4.67_all.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
@@ -82,7 +82,7 @@ Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_amd64.deb) ...
 Setting up libmagic1 (4.15-2) ...
 
 Setting up file (4.15-2) ...
-Setting up debconf-utils (1.4.66) ...
+Setting up debconf-utils (1.4.67) ...
 
 Setting up html2text (1.3.2a-3) ...
 
@@ -103,7 +103,7 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12595 files and directories currently installed.)
+(Reading database ... 12598 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.6_amd64.deb) ...
 Setting up fakeroot (1.5.6) ...
 
@@ -116,14 +116,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -312,18 +312,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -336,26 +336,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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
@@ -391,10 +391,10 @@ success
 success
 success
 success
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -406,7 +406,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Jan 13 03:21:48 UTC 2006
+Thu Jan 19 07:01:26 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -419,6 +419,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
@@ -433,18 +445,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
@@ -476,14 +476,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
-Fri Jan 13 03:21:53 UTC 2006
+Thu Jan 19 07:01:31 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
+dsh: Process terminated (before write).
 b: b
 c: c
-dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -492,9 +492,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -504,58 +504,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.fUr6UL/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.eb5lQm/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.eb5lQm/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.fUr6UL/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.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.fUr6UL/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.eb5lQm/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.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/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.fUr6UL/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.fUr6UL/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.fUr6UL/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.fUr6UL/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.eb5lQm/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.eb5lQm/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.eb5lQm/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.eb5lQm/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.eb5lQm/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -593,6 +593,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/7885 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/18861 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sarge.log b/testsuite/normal/pdebuild-internal-sarge.log
index 37d105e..84fcdba 100644
--- a/testsuite/normal/pdebuild-internal-sarge.log
+++ b/testsuite/normal/pdebuild-internal-sarge.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/28607/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/14149/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -110,14 +110,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -305,18 +305,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -329,26 +329,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -384,10 +384,10 @@ success
 success
 success
 success
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -399,7 +399,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Jan 13 03:11:27 UTC 2006
+Thu Jan 19 03:11:40 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -469,14 +469,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Jan 13 03:11:32 UTC 2006
+Thu Jan 19 03:11:45 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
 c: c
 dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -485,9 +485,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -495,58 +495,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.fUr6UL/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.eb5lQm/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.eb5lQm/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.fUr6UL/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.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.fUr6UL/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.eb5lQm/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.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/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.fUr6UL/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.fUr6UL/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.fUr6UL/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.fUr6UL/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.eb5lQm/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.eb5lQm/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.eb5lQm/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.eb5lQm/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.eb5lQm/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -570,6 +570,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/28607 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/14149 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index b1a5cc0..5f06269 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/25864/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/16282/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -21,21 +21,21 @@ Recommended packages:
 The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 pbuilder
 0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/135kB of archives.
+Need to get 0B/136kB of archives.
 After unpacking 754kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11191 files and directories currently installed.)
-Unpacking libdebian-installer4 (from .../libdebian-installer4_0.36_amd64.deb) ...
+(Reading database ... 11195 files and directories currently installed.)
+Unpacking libdebian-installer4 (from .../libdebian-installer4_0.37_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
-Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.36_amd64.deb) ...
+Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.37_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.3.9_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.144_all.deb) ...
-Setting up libdebian-installer4 (0.36) ...
-Setting up libdebian-installer-extra4 (0.36) ...
+Unpacking pbuilder (from .../pbuilder_0.145_all.deb) ...
+Setting up libdebian-installer4 (0.37) ...
+Setting up libdebian-installer-extra4 (0.37) ...
 Setting up cdebootstrap (0.3.9) ...
-Setting up pbuilder (0.144) ...
+Setting up pbuilder (0.145) ...
 Setting DEBBUILDOPTS=
  -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.22 2005/12/04 05:16:40 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
@@ -57,9 +57,9 @@ The following NEW packages will be installed:
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
 Need to get 0B/2914kB of archives.
-After unpacking 9630kB of additional disk space will be used.
+After unpacking 9622kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11287 files and directories currently installed.)
+(Reading database ... 11291 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -74,7 +74,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.2_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.15_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.17_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -90,7 +90,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.2) ...
-Setting up debhelper (5.0.15) ...
+Setting up debhelper (5.0.17) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -103,7 +103,7 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11885 files and directories currently installed.)
+(Reading database ... 11887 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.6_amd64.deb) ...
 Setting up fakeroot (1.5.6) ...
 
@@ -116,14 +116,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -312,18 +312,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -336,26 +336,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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
@@ -367,7 +367,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
@@ -406,7 +405,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Jan 13 03:05:32 UTC 2006
+Thu Jan 19 03:06:01 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -476,14 +475,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
-Fri Jan 13 03:05:37 UTC 2006
+Thu Jan 19 03:06:06 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -492,9 +491,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -504,58 +503,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.fUr6UL/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.eb5lQm/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.eb5lQm/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.fUr6UL/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.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.fUr6UL/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.eb5lQm/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.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/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.fUr6UL/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.fUr6UL/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.fUr6UL/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.fUr6UL/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/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.eb5lQm/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.eb5lQm/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.eb5lQm/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.eb5lQm/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.eb5lQm/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -593,6 +592,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.fUr6UL/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/25864 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/16282 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 62bcc74..1e85873 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Jan 13 12:19:43 JST 2006
-pbuilder-time-stamp: 1137122383
+Current time: Thu Jan 19 15:59:44 JST 2006
+pbuilder-time-stamp: 1137653984
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/32569/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/11967/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -66,12 +66,12 @@ The following NEW packages will be installed:
 Need to get 0B/2917kB of archives.
 After unpacking 9617kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11903 files and directories currently installed.)
+(Reading database ... 11906 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
 Selecting previously deselected package debconf-utils.
-Unpacking debconf-utils (from .../debconf-utils_1.4.66_all.deb) ...
+Unpacking debconf-utils (from .../debconf-utils_1.4.67_all.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
@@ -89,7 +89,7 @@ Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_amd64.deb) ...
 Setting up libmagic1 (4.15-2) ...
 
 Setting up file (4.15-2) ...
-Setting up debconf-utils (1.4.66) ...
+Setting up debconf-utils (1.4.67) ...
 
 Setting up html2text (1.3.2a-3) ...
 
@@ -110,13 +110,13 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12499 files and directories currently installed.)
+(Reading database ... 12502 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.6_amd64.deb) ...
 Setting up fakeroot (1.5.6) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/32569/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/32569/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/11967/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/11967/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -429,8 +429,8 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
@@ -440,11 +440,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
-Fri Jan 13 03:20:42 UTC 2006
+Thu Jan 19 07:00:28 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -514,14 +514,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
-Fri Jan 13 03:20:47 UTC 2006
+Thu Jan 19 07:00:33 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -643,7 +643,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: Fri Jan 13 12:20:49 JST 2006
-pbuilder-time-stamp: 1137122449
+Current time: Thu Jan 19 16:00:35 JST 2006
+pbuilder-time-stamp: 1137654035
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/32569 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/11967 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index 120c8f6..9c97c18 100644
--- a/testsuite/normal/pdebuild-normal-sarge.log
+++ b/testsuite/normal/pdebuild-normal-sarge.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Jan 13 12:09:20 JST 2006
-pbuilder-time-stamp: 1137121760
+Current time: Thu Jan 19 12:10:05 JST 2006
+pbuilder-time-stamp: 1137640205
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/20939/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/7260/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -115,8 +115,8 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/20939/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/20939/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/7260/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/7260/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -437,11 +437,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
-Fri Jan 13 03:10:25 UTC 2006
+Thu Jan 19 03:10:49 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -511,14 +511,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Jan 13 03:10:30 UTC 2006
+Thu Jan 19 03:10:54 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -624,7 +624,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Jan 13 12:10:32 JST 2006
-pbuilder-time-stamp: 1137121832
+Current time: Thu Jan 19 12:10:56 JST 2006
+pbuilder-time-stamp: 1137640256
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/20939 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/7260 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 782eba1..5f5415f 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/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.fUr6UL/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Jan 13 12:03:37 JST 2006
-pbuilder-time-stamp: 1137121417
+Current time: Thu Jan 19 12:04:21 JST 2006
+pbuilder-time-stamp: 1137639861
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/18223/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/9387/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -64,9 +64,9 @@ The following NEW packages will be installed:
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
 Need to get 0B/2914kB of archives.
-After unpacking 9630kB of additional disk space will be used.
+After unpacking 9622kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11191 files and directories currently installed.)
+(Reading database ... 11195 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -81,7 +81,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.2_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.15_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.17_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -97,7 +97,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.2) ...
-Setting up debhelper (5.0.15) ...
+Setting up debhelper (5.0.17) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -110,13 +110,13 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11789 files and directories currently installed.)
+(Reading database ... 11791 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.6_amd64.deb) ...
 Setting up fakeroot (1.5.6) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/18223/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/18223/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/9387/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/9387/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -444,7 +444,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
-Fri Jan 13 03:04:29 UTC 2006
+Thu Jan 19 03:05:05 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -514,13 +514,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
-Fri Jan 13 03:04:34 UTC 2006
+Thu Jan 19 03:05:10 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
-dsh: Process terminated (before write).
 a: a
+dsh: Process terminated (before write).
+b: b
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -643,7 +643,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: Fri Jan 13 12:04:37 JST 2006
-pbuilder-time-stamp: 1137121477
+Current time: Thu Jan 19 12:05:12 JST 2006
+pbuilder-time-stamp: 1137639912
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.fUr6UL/dir3/18223 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.eb5lQm/dir3/9387 and its subdirectories
author	dancer <dancer>	2006-01-19 08:38:15 +0000
committer	dancer <dancer>	2006-01-19 08:38:15 +0000
commit	e2886efd0f337666d8444849e518d0670abe0284 (patch)
tree	461f3c8af1c4426969a793a3d2e40a543de28e6d /testsuite/normal
parent	c0e0d9a6f0f47dcab1c16fcd6f7e781f38c75f5d (diff)
download	pbuilder-e2886efd0f337666d8444849e518d0670abe0284.tar pbuilder-e2886efd0f337666d8444849e518d0670abe0284.tar.gz