testsuite update

12 files changed, 384 insertions, 406 deletions

diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 244dbf2..fbc6b9a 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 16 12:07:05 JST 2006
-pbuilder-time-stamp: 1166238425
+Current time: Tue Dec 26 12:07:37 JST 2006
+pbuilder-time-stamp: 1167102457
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -32,8 +32,8 @@ The following NEW packages will be installed:
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
 Need to get 3345kB of archives.
 After unpacking 10.9MB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-4 [277kB]
-Get:2 http://ftp.jp.debian.org etch/main file 4.17-4 [32.0kB]
+Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-5 [277kB]
+Get:2 http://ftp.jp.debian.org etch/main file 4.17-5 [32.0kB]
 Get:3 http://ftp.jp.debian.org etch/main html2text 1.3.2a-3 [92.7kB]
 Get:4 http://ftp.jp.debian.org etch/main gettext 0.16.1-1 [2261kB]
 Get:5 http://ftp.jp.debian.org etch/main intltool-debian 0.35.0+20060710.1 [30.8kB]
@@ -41,12 +41,12 @@ Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.7 [106kB]
 Get:7 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:8 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3345kB in 1s (1996kB/s)
+Fetched 3345kB in 1s (1910kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12175 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
+(Reading database ... 12199 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
+Unpacking file (from .../archives/file_4.17-5_amd64.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
@@ -61,9 +61,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.17-4) ...
+Setting up libmagic1 (4.17-5) ...
 
-Setting up file (4.17-4) ...
+Setting up file (4.17-5) ...
 Setting up html2text (1.3.2a-3) ...
 
 Setting up gettext (0.16.1-1) ...
@@ -83,16 +83,16 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (980kB/s)
+Fetched 97.4kB in 0s (548kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12779 files and directories currently installed.)
+(Reading database ... 12803 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: can't open `/gnupg/options.skel': No such file or directory
@@ -420,7 +420,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 16 03:07:30 UTC 2006
+Tue Dec 26 03:08: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
@@ -490,14 +490,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 16 03:07:35 UTC 2006
+Tue Dec 26 03:08:10 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
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -603,7 +603,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Dec 16 12:07:37 JST 2006
-pbuilder-time-stamp: 1166238457
+Current time: Tue Dec 26 12:08:12 JST 2006
+pbuilder-time-stamp: 1167102492
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir1/31677 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir1/27948 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index e8730e6..a0c5514 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 16 12:02:46 JST 2006
-pbuilder-time-stamp: 1166238166
+Current time: Tue Dec 26 12:02:58 JST 2006
+pbuilder-time-stamp: 1167102178
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -41,9 +41,9 @@ Get:6 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:8 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3350kB in 3s (988kB/s)
+Fetched 3350kB in 2s (1257kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12191 files and directories currently installed.)
+(Reading database ... 12189 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-5_amd64.deb) ...
@@ -83,16 +83,16 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (496kB/s)
+Fetched 97.4kB in 0s (359kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12796 files and directories currently installed.)
+(Reading database ... 12794 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: can't open `/gnupg/options.skel': No such file or directory
@@ -420,7 +420,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 16 03:03:15 UTC 2006
+Tue Dec 26 03:03:27 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
@@ -433,6 +433,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
@@ -447,18 +459,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
@@ -490,7 +490,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 16 03:03:20 UTC 2006
+Tue Dec 26 03:03:32 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -603,7 +603,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Dec 16 12:03:23 JST 2006
-pbuilder-time-stamp: 1166238203
+Current time: Tue Dec 26 12:03:34 JST 2006
+pbuilder-time-stamp: 1167102214
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir1/1774 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir1/30392 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index d6cc0c8..5b686da 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -612,7 +612,7 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//19466/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//15653/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -621,7 +621,7 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org etch Release.gpg [378B]
 Hit http://ftp.jp.debian.org etch Release
 Get:2 http://ftp.jp.debian.org etch/main Packages/DiffIndex [2038B]
-Fetched 2416B in 0s (9860B/s)
+Fetched 2416B in 0s (8632B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -647,12 +647,12 @@ The following NEW packages will be installed:
   perl-modules
 0 upgraded, 17 newly installed, 0 to remove and 0 not upgraded.
 Need to get 21.2MB of archives.
-After unpacking 86.4MB of additional disk space will be used.
+After unpacking 86.5MB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main binutils 2.17-3 [2630kB]
 Get:2 http://ftp.jp.debian.org etch/main cpp-4.1 4.1.1-19 [2480kB]
 Get:3 http://ftp.jp.debian.org etch/main cpp 4:4.1.1-13 [10.3kB]
-Get:4 http://ftp.jp.debian.org etch/main perl-modules 5.8.8-6.1 [2309kB]
-Get:5 http://ftp.jp.debian.org etch/main perl 5.8.8-6.1 [4233kB]
+Get:4 http://ftp.jp.debian.org etch/main perl-modules 5.8.8-7 [2310kB]
+Get:5 http://ftp.jp.debian.org etch/main perl 5.8.8-7 [4240kB]
 Get:6 http://ftp.jp.debian.org etch/main patch 2.5.9-4 [98.7kB]
 Get:7 http://ftp.jp.debian.org etch/main make 3.81-2 [390kB]
 Get:8 http://ftp.jp.debian.org etch/main dpkg-dev 1.13.24 [164kB]
@@ -665,18 +665,18 @@ Get:14 http://ftp.jp.debian.org etch/main libstdc++6-4.1-dev 4.1.1-19 [1619kB]
 Get:15 http://ftp.jp.debian.org etch/main g++-4.1 4.1.1-19 [2785kB]
 Get:16 http://ftp.jp.debian.org etch/main g++ 4:4.1.1-13 [1362B]
 Get:17 http://ftp.jp.debian.org etch/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 11s (1818kB/s)
+Fetched 21.2MB in 10s (2029kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 7279 files and directories currently installed.)
+(Reading database ... 7278 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.17-3_amd64.deb) ...
 Selecting previously deselected package cpp-4.1.
 Unpacking cpp-4.1 (from .../cpp-4.1_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package perl-modules.
-Unpacking perl-modules (from .../perl-modules_5.8.8-6.1_all.deb) ...
+Unpacking perl-modules (from .../perl-modules_5.8.8-7_all.deb) ...
 Selecting previously deselected package perl.
-Unpacking perl (from .../perl_5.8.8-6.1_amd64.deb) ...
+Unpacking perl (from .../perl_5.8.8-7_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package make.
@@ -715,9 +715,9 @@ Setting up gcc (4.1.1-13) ...
 
 Setting up linux-kernel-headers (2.6.18-6) ...
 Setting up libc6-dev (2.3.6.ds1-8) ...
-Setting up perl-modules (5.8.8-6.1) ...
+Setting up perl-modules (5.8.8-7) ...
 Setting up libstdc++6-4.1-dev (4.1.1-19) ...
-Setting up perl (5.8.8-6.1) ...
+Setting up perl (5.8.8-7) ...
 
 Setting up dpkg-dev (1.13.24) ...
 Setting up g++-4.1 (4.1.1-19) ...
@@ -731,9 +731,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: 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//19466/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//15653/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.YbrEq21995/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//19466 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//15653 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 94131fa..48e7dbd 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -612,7 +612,7 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//22000/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//18071/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -621,7 +621,7 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [378B]
 Hit http://ftp.jp.debian.org sid Release
 Get:2 http://ftp.jp.debian.org sid/main Packages/DiffIndex [2038B]
-Fetched 2416B in 0s (5649B/s)
+Fetched 2416B in 0s (8721B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -664,9 +664,9 @@ Get:14 http://ftp.jp.debian.org sid/main libstdc++6-4.1-dev 4.1.1-21 [1643kB]
 Get:15 http://ftp.jp.debian.org sid/main g++-4.1 4.1.1-21 [2786kB]
 Get:16 http://ftp.jp.debian.org sid/main g++ 4:4.1.1-13 [1362B]
 Get:17 http://ftp.jp.debian.org sid/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 13s (1624kB/s)
+Fetched 21.2MB in 11s (1901kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 7270 files and directories currently installed.)
+(Reading database ... 7268 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.17-3_amd64.deb) ...
 Selecting previously deselected package cpp-4.1.
 Unpacking cpp-4.1 (from .../cpp-4.1_4.1.1-21_amd64.deb) ...
@@ -730,9 +730,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: 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//22000/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//18071/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.YbrEq21995/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22000 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//18071 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 0a8a40b..1fe6f33 100644
--- a/testsuite/normal/pbuilder-execute-etch.log
+++ b/testsuite/normal/pbuilder-execute-etch.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//16842 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13098 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index b845863..aa27817 100644
--- a/testsuite/normal/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//19409 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//15592 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index 08f8116..7dc3e9c 100644
--- a/testsuite/normal/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -15,8 +15,8 @@ Get:2 http://ftp.jp.debian.org experimental Release.gpg [378B]
 Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org experimental Release [79.6kB]
 Get:4 http://ftp.jp.debian.org sid/main Packages/DiffIndex [2038B]
-Get:5 http://ftp.jp.debian.org experimental/main Packages [248kB]
-Fetched 330kB in 0s (482kB/s)
+Get:5 http://ftp.jp.debian.org experimental/main Packages [255kB]
+Fetched 337kB in 0s (532kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -44,13 +44,13 @@ Get:10 http://ftp.jp.debian.org experimental/main libgnutls13 1.6.0-1 [323kB]
 Get:11 http://ftp.jp.debian.org experimental/main libtasn1-3-bin 0.3.7-1 [37.0kB]
 Get:12 http://ftp.jp.debian.org experimental/main wget 1.10.2+1.11.beta1-1 [635kB]
 Get:13 http://ftp.jp.debian.org experimental/main binutils 2.17.20061210cvs-1 [2745kB]
-Fetched 14.7MB in 8s (1732kB/s)
-(Reading database ... 12191 files and directories currently installed.)
+Fetched 14.7MB in 9s (1557kB/s)
+(Reading database ... 12189 files and directories currently installed.)
 Preparing to replace coreutils 5.97-5.2 (using .../coreutils_6.0-1_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (6.0-1) ...
 
-(Reading database ... 12203 files and directories currently installed.)
+(Reading database ... 12201 files and directories currently installed.)
 Preparing to replace libc6-dev 2.3.6.ds1-9 (using .../libc6-dev_2.5-0exp3_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.6.ds1-9 (using .../libc6_2.5-0exp3_amd64.deb) ...
@@ -60,7 +60,7 @@ Installing new version of config file /etc/init.d/glibc.sh ...
 init: timeout opening/writing control channel /dev/initctl
 
 Selecting previously deselected package gcc-4.2-base.
-(Reading database ... 12267 files and directories currently installed.)
+(Reading database ... 12265 files and directories currently installed.)
 Unpacking gcc-4.2-base (from .../gcc-4.2-base_4.2-20061003-1_amd64.deb) ...
 Preparing to replace libgcc1 1:4.1.1-21 (using .../libgcc1_1%3a4.2-20061003-1_amd64.deb) ...
 Unpacking replacement libgcc1 ...
@@ -68,12 +68,12 @@ Setting up gcc-4.2-base (4.2-20061003-1) ...
 
 Setting up libgcc1 (4.2-20061003-1) ...
 
-(Reading database ... 12273 files and directories currently installed.)
+(Reading database ... 12271 files and directories currently installed.)
 Preparing to replace libstdc++6 4.1.1-21 (using .../libstdc++6_4.2-20061003-1_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.2-20061003-1) ...
 
-(Reading database ... 12273 files and directories currently installed.)
+(Reading database ... 12271 files and directories currently installed.)
 Preparing to replace cpio 2.6-17 (using .../cpio_2.7-0exp1_amd64.deb) ...
 Unpacking replacement cpio ...
 Preparing to replace libopencdk8 0.5.9-2 (using .../libopencdk8_0.5.11-1_amd64.deb) ...
@@ -115,9 +115,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: 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//17816/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//14037/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.YbrEq21995/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//17816 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14037 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 477a47d..132dc40 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -11,85 +11,76 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [378B]
 Get:2 http://ftp.jp.debian.org sid Release [79.6kB]
-Get:3 http://ftp.jp.debian.org sid/main Packages [5866kB]
-Fetched 5946kB in 3s (1849kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [5833kB]
+Fetched 5913kB in 9s (612kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
-  aptitude bash coreutils cpp-4.1 cyrus-sasl2-doc debconf debconf-i18n
-  debianutils dhcp3-client dhcp3-common g++-4.1 gcc-4.1 gcc-4.1-base klogd
-  libc6 libc6-dev libdevmapper1.02 libgcc1 libgpg-error0 libldap-2.3-0
-  libldap2 libsasl2 libsasl2-2 libsepol1 libssp0 libstdc++6 libstdc++6-4.1-dev
-  login make nano passwd perl perl-base perl-modules sysklogd tasksel
-  tasksel-data vim-common vim-tiny
-39 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 34.2MB of archives.
-After unpacking 319kB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main debianutils 2.17.4 [52.4kB]
-Get:2 http://ftp.jp.debian.org sid/main bash 3.1dfsg-8 [910kB]
-Get:3 http://ftp.jp.debian.org sid/main coreutils 5.97-5.2 [3201kB]
-Get:4 http://ftp.jp.debian.org sid/main login 1:4.0.18.1-6 [802kB]
-Get:5 http://ftp.jp.debian.org sid/main perl-modules 5.8.8-7 [2310kB]
+  adduser coreutils cpp-4.1 cron debconf debconf-i18n debianutils g++-4.1
+  gcc-4.1 gcc-4.1-base gzip klogd libacl1 libattr1 libc6 libc6-dev
+  libdevmapper1.02 libgcc1 libgpg-error0 libldap-2.3-0 libldap2 libreadline5
+  libsepol1 libssp0 libstdc++6 libstdc++6-4.1-dev make nano readline-common
+  sysklogd tasksel tasksel-data vim-common vim-tiny
+34 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 21.2MB of archives.
+After unpacking 69.6kB of additional disk space will be used.
+Get:1 http://ftp.jp.debian.org sid/main coreutils 5.97-5.2 [3201kB]
+Get:2 http://ftp.jp.debian.org sid/main debianutils 2.17.4 [52.4kB]
+Get:3 http://ftp.jp.debian.org sid/main gzip 1.3.9-2 [80.5kB]
+Get:4 http://ftp.jp.debian.org sid/main debconf-i18n 1.5.11 [151kB]
+Get:5 http://ftp.jp.debian.org sid/main debconf 1.5.11 [146kB]
 Get:6 http://ftp.jp.debian.org sid/main libc6-dev 2.3.6.ds1-9 [2118kB]
 Get:7 http://ftp.jp.debian.org sid/main libc6 2.3.6.ds1-9 [4174kB]
-Get:8 http://ftp.jp.debian.org sid/main perl 5.8.8-7 [4240kB]
-Get:9 http://ftp.jp.debian.org sid/main perl-base 5.8.8-7 [806kB]
-Get:10 http://ftp.jp.debian.org sid/main debconf-i18n 1.5.10 [152kB]
-Get:11 http://ftp.jp.debian.org sid/main debconf 1.5.10 [146kB]
-Get:12 http://ftp.jp.debian.org sid/main cpp-4.1 4.1.1-21 [2482kB]
-Get:13 http://ftp.jp.debian.org sid/main gcc-4.1-base 4.1.1-21 [199kB]
-Get:14 http://ftp.jp.debian.org sid/main libgcc1 1:4.1.1-21 [24.6kB]
-Get:15 http://ftp.jp.debian.org sid/main gcc-4.1 4.1.1-21 [475kB]
-Get:16 http://ftp.jp.debian.org sid/main g++-4.1 4.1.1-21 [2786kB]
-Get:17 http://ftp.jp.debian.org sid/main libstdc++6-4.1-dev 4.1.1-21 [1643kB]
-Get:18 http://ftp.jp.debian.org sid/main libssp0 4.1.1-21 [4956B]
-Get:19 http://ftp.jp.debian.org sid/main libstdc++6 4.1.1-21 [288kB]
-Get:20 http://ftp.jp.debian.org sid/main libsepol1 1.14-2 [124kB]
-Get:21 http://ftp.jp.debian.org sid/main aptitude 0.4.4-1 [2877kB]
-Get:22 http://ftp.jp.debian.org sid/main cyrus-sasl2-doc 2.1.22.dfsg1-8 [98.7kB]
-Get:23 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.4-12 [221kB]
-Get:24 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.4-12 [287kB]
-Get:25 http://ftp.jp.debian.org sid/main sysklogd 1.4.1-20 [60.2kB]
-Get:26 http://ftp.jp.debian.org sid/main klogd 1.4.1-20 [40.7kB]
-Get:27 http://ftp.jp.debian.org sid/main libgpg-error0 1.4-2 [34.8kB]
-Get:28 http://ftp.jp.debian.org sid/main libsasl2 2.1.22.dfsg1-8 [40.8kB]
-Get:29 http://ftp.jp.debian.org sid/main libsasl2-2 2.1.22.dfsg1-8 [106kB]
-Get:30 http://ftp.jp.debian.org sid/main libldap2 2.1.30-13.2 [162kB]
-Get:31 http://ftp.jp.debian.org sid/main libldap-2.3-0 2.3.30-2 [285kB]
-Get:32 http://ftp.jp.debian.org sid/main nano 2.0.1-1 [554kB]
-Get:33 http://ftp.jp.debian.org sid/main tasksel-data 2.59 [329kB]
-Get:34 http://ftp.jp.debian.org sid/main tasksel 2.59 [74.2kB]
-Get:35 http://ftp.jp.debian.org sid/main vim-tiny 1:7.0-164+1 [615kB]
-Get:36 http://ftp.jp.debian.org sid/main vim-common 1:7.0-164+1 [218kB]
-Get:37 http://ftp.jp.debian.org sid/main libdevmapper1.02 2:1.02.12-1 [42.0kB]
-Get:38 http://ftp.jp.debian.org sid/main passwd 1:4.0.18.1-6 [865kB]
-Get:39 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
-Fetched 34.2MB in 14s (2361kB/s)
-(Reading database ... 12175 files and directories currently installed.)
-Preparing to replace debianutils 2.17 (using .../debianutils_2.17.4_amd64.deb) ...
-Unpacking replacement debianutils ...
-Setting up debianutils (2.17.4) ...
-
-(Reading database ... 12175 files and directories currently installed.)
-Preparing to replace bash 3.1dfsg-7 (using .../bash_3.1dfsg-8_amd64.deb) ...
-Unpacking replacement bash ...
-Setting up bash (3.1dfsg-8) ...
-
-(Reading database ... 12175 files and directories currently installed.)
+Get:8 http://ftp.jp.debian.org sid/main libattr1 1:2.4.32-1.1 [9976B]
+Get:9 http://ftp.jp.debian.org sid/main libacl1 2.2.42-1 [16.1kB]
+Get:10 http://ftp.jp.debian.org sid/main cpp-4.1 4.1.1-21 [2482kB]
+Get:11 http://ftp.jp.debian.org sid/main gcc-4.1-base 4.1.1-21 [199kB]
+Get:12 http://ftp.jp.debian.org sid/main libgcc1 1:4.1.1-21 [24.6kB]
+Get:13 http://ftp.jp.debian.org sid/main gcc-4.1 4.1.1-21 [475kB]
+Get:14 http://ftp.jp.debian.org sid/main g++-4.1 4.1.1-21 [2786kB]
+Get:15 http://ftp.jp.debian.org sid/main libstdc++6-4.1-dev 4.1.1-21 [1643kB]
+Get:16 http://ftp.jp.debian.org sid/main libssp0 4.1.1-21 [4956B]
+Get:17 http://ftp.jp.debian.org sid/main libstdc++6 4.1.1-21 [288kB]
+Get:18 http://ftp.jp.debian.org sid/main libsepol1 1.14-2 [124kB]
+Get:19 http://ftp.jp.debian.org sid/main adduser 3.101 [180kB]
+Get:20 http://ftp.jp.debian.org sid/main cron 3.0pl1-100 [82.9kB]
+Get:21 http://ftp.jp.debian.org sid/main sysklogd 1.4.1-20 [60.2kB]
+Get:22 http://ftp.jp.debian.org sid/main klogd 1.4.1-20 [40.7kB]
+Get:23 http://ftp.jp.debian.org sid/main libgpg-error0 1.4-2 [34.8kB]
+Get:24 http://ftp.jp.debian.org sid/main libldap2 2.1.30-13.2 [162kB]
+Get:25 http://ftp.jp.debian.org sid/main libldap-2.3-0 2.3.30-2 [285kB]
+Get:26 http://ftp.jp.debian.org sid/main readline-common 5.2-2 [50.6kB]
+Get:27 http://ftp.jp.debian.org sid/main libreadline5 5.2-2 [139kB]
+Get:28 http://ftp.jp.debian.org sid/main nano 2.0.2-1 [557kB]
+Get:29 http://ftp.jp.debian.org sid/main tasksel-data 2.59 [329kB]
+Get:30 http://ftp.jp.debian.org sid/main tasksel 2.59 [74.2kB]
+Get:31 http://ftp.jp.debian.org sid/main vim-tiny 1:7.0-164+1 [615kB]
+Get:32 http://ftp.jp.debian.org sid/main vim-common 1:7.0-164+1 [218kB]
+Get:33 http://ftp.jp.debian.org sid/main libdevmapper1.02 2:1.02.12-1 [42.0kB]
+Get:34 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
+Fetched 21.2MB in 9s (2315kB/s)
+(Reading database ... 12199 files and directories currently installed.)
 Preparing to replace coreutils 5.97-5 (using .../coreutils_5.97-5.2_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (5.97-5.2) ...
 
-(Reading database ... 12175 files and directories currently installed.)
-Preparing to replace login 1:4.0.18.1-5 (using .../login_1%3a4.0.18.1-6_amd64.deb) ...
-Unpacking replacement login ...
-Setting up login (4.0.18.1-6) ...
+(Reading database ... 12199 files and directories currently installed.)
+Preparing to replace debianutils 2.17 (using .../debianutils_2.17.4_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.17.4) ...
 
-(Reading database ... 12175 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.8-6.1 (using .../perl-modules_5.8.8-7_all.deb) ...
-Unpacking replacement perl-modules ...
+(Reading database ... 12199 files and directories currently installed.)
+Preparing to replace gzip 1.3.5-15 (using .../gzip_1.3.9-2_amd64.deb) ...
+Unpacking replacement gzip ...
+Setting up gzip (1.3.9-2) ...
+
+(Reading database ... 12199 files and directories currently installed.)
+Preparing to replace debconf-i18n 1.5.8 (using .../debconf-i18n_1.5.11_all.deb) ...
+Unpacking replacement debconf-i18n ...
+Preparing to replace debconf 1.5.8 (using .../debconf_1.5.11_all.deb) ...
+Unpacking replacement debconf ...
 Preparing to replace libc6-dev 2.3.6.ds1-8 (using .../libc6-dev_2.3.6.ds1-9_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.6.ds1-8 (using .../libc6_2.3.6.ds1-9_amd64.deb) ...
@@ -97,17 +88,16 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6.ds1-9) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12176 files and directories currently installed.)
-Preparing to replace perl 5.8.8-6.1 (using .../perl_5.8.8-7_amd64.deb) ...
-Unpacking replacement perl ...
-Preparing to replace perl-base 5.8.8-6.1 (using .../perl-base_5.8.8-7_amd64.deb) ...
-Unpacking replacement perl-base ...
-Setting up perl-base (5.8.8-7) ...
 (Reading database ... 12200 files and directories currently installed.)
-Preparing to replace debconf-i18n 1.5.8 (using .../debconf-i18n_1.5.10_all.deb) ...
-Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.5.8 (using .../debconf_1.5.10_all.deb) ...
-Unpacking replacement debconf ...
+Preparing to replace libattr1 2.4.32-1 (using .../libattr1_1%3a2.4.32-1.1_amd64.deb) ...
+Unpacking replacement libattr1 ...
+Preparing to replace libacl1 2.2.41-1 (using .../libacl1_2.2.42-1_amd64.deb) ...
+Unpacking replacement libacl1 ...
+Setting up libattr1 (2.4.32-1.1) ...
+
+Setting up libacl1 (2.2.42-1) ...
+
+(Reading database ... 12200 files and directories currently installed.)
 Preparing to replace cpp-4.1 4.1.1-19 (using .../cpp-4.1_4.1.1-21_amd64.deb) ...
 Unpacking replacement cpp-4.1 ...
 Preparing to replace gcc-4.1-base 4.1.1-19 (using .../gcc-4.1-base_4.1.1-21_amd64.deb) ...
@@ -118,7 +108,7 @@ Setting up gcc-4.1-base (4.1.1-21) ...
 
 Setting up libgcc1 (4.1.1-21) ...
 
-(Reading database ... 12201 files and directories currently installed.)
+(Reading database ... 12200 files and directories currently installed.)
 Preparing to replace gcc-4.1 4.1.1-19 (using .../gcc-4.1_4.1.1-21_amd64.deb) ...
 Unpacking replacement gcc-4.1 ...
 Preparing to replace g++-4.1 4.1.1-19 (using .../g++-4.1_4.1.1-21_amd64.deb) ...
@@ -131,37 +121,33 @@ Preparing to replace libstdc++6 4.1.1-19 (using .../libstdc++6_4.1.1-21_amd64.de
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.1.1-21) ...
 
-(Reading database ... 12201 files and directories currently installed.)
+(Reading database ... 12200 files and directories currently installed.)
 Preparing to replace libsepol1 1.14-1 (using .../libsepol1_1.14-2_amd64.deb) ...
 Unpacking replacement libsepol1 ...
 Setting up libsepol1 (1.14-2) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12201 files and directories currently installed.)
-Preparing to replace aptitude 0.4.3-1 (using .../aptitude_0.4.4-1_amd64.deb) ...
-Unpacking replacement aptitude ...
-Preparing to replace cyrus-sasl2-doc 2.1.22.dfsg1-7 (using .../cyrus-sasl2-doc_2.1.22.dfsg1-8_all.deb) ...
-Unpacking replacement cyrus-sasl2-doc ...
-Preparing to replace dhcp3-client 3.0.4-10 (using .../dhcp3-client_3.0.4-12_amd64.deb) ...
-Unpacking replacement dhcp3-client ...
-Preparing to replace dhcp3-common 3.0.4-10 (using .../dhcp3-common_3.0.4-12_amd64.deb) ...
-Unpacking replacement dhcp3-common ...
+(Reading database ... 12200 files and directories currently installed.)
+Preparing to replace adduser 3.100 (using .../archives/adduser_3.101_all.deb) ...
+Unpacking replacement adduser ...
+Preparing to replace cron 3.0pl1-99 (using .../cron_3.0pl1-100_amd64.deb) ...
+Unpacking replacement cron ...
 Preparing to replace sysklogd 1.4.1-18 (using .../sysklogd_1.4.1-20_amd64.deb) ...
 Unpacking replacement sysklogd ...
 Preparing to replace klogd 1.4.1-18 (using .../klogd_1.4.1-20_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace libgpg-error0 1.4-1 (using .../libgpg-error0_1.4-2_amd64.deb) ...
 Unpacking replacement libgpg-error0 ...
-Preparing to replace libsasl2 2.1.22.dfsg1-7 (using .../libsasl2_2.1.22.dfsg1-8_amd64.deb) ...
-Unpacking replacement libsasl2 ...
-Preparing to replace libsasl2-2 2.1.22.dfsg1-7 (using .../libsasl2-2_2.1.22.dfsg1-8_amd64.deb) ...
-Unpacking replacement libsasl2-2 ...
 Preparing to replace libldap2 2.1.30-13+b1 (using .../libldap2_2.1.30-13.2_amd64.deb) ...
 Unpacking replacement libldap2 ...
 Replaced by files in installed package libldap-2.3-0 ...
 Preparing to replace libldap-2.3-0 2.3.29-1 (using .../libldap-2.3-0_2.3.30-2_amd64.deb) ...
 Unpacking replacement libldap-2.3-0 ...
-Preparing to replace nano 2.0.0-1 (using .../nano_2.0.1-1_amd64.deb) ...
+Preparing to replace readline-common 5.2-1 (using .../readline-common_5.2-2_all.deb) ...
+Unpacking replacement readline-common ...
+Preparing to replace libreadline5 5.2-1 (using .../libreadline5_5.2-2_amd64.deb) ...
+Unpacking replacement libreadline5 ...
+Preparing to replace nano 2.0.1-1 (using .../nano_2.0.2-1_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace tasksel-data 2.58 (using .../tasksel-data_2.59_all.deb) ...
 Unpacking replacement tasksel-data ...
@@ -177,8 +163,6 @@ dpkg: warning - unable to delete old directory `/usr/share/man/ru.KOI8-R/man1':
 dpkg: warning - unable to delete old directory `/usr/share/man/ru.KOI8-R': Directory not empty
 Preparing to replace libdevmapper1.02 2:1.02.08-1 (using .../libdevmapper1.02_2%3a1.02.12-1_amd64.deb) ...
 Unpacking replacement libdevmapper1.02 ...
-Preparing to replace passwd 1:4.0.18.1-5 (using .../passwd_1%3a4.0.18.1-6_amd64.deb) ...
-Unpacking replacement passwd ...
 Preparing to replace make 3.81-2 (using .../archives/make_3.81-3_amd64.deb) ...
 Unpacking replacement make ...
 Setting up libc6-dev (2.3.6.ds1-9) ...
@@ -186,20 +170,17 @@ Setting up cpp-4.1 (4.1.1-21) ...
 Setting up libssp0 (4.1.1-21) ...
 
 Setting up gcc-4.1 (4.1.1-21) ...
-Setting up aptitude (0.4.4-1) ...
-
-Setting up cyrus-sasl2-doc (2.1.22.dfsg1-8) ...
-Setting up dhcp3-common (3.0.4-12) ...
 Setting up libgpg-error0 (1.4-2) ...
 
-Setting up libsasl2-2 (2.1.22.dfsg1-8) ...
-
-Setting up libsasl2 (2.1.22.dfsg1-8) ...
 Setting up libldap2 (2.1.30-13.2) ...
 
 Setting up libldap-2.3-0 (2.3.30-2) ...
 
-Setting up nano (2.0.1-1) ...
+Setting up readline-common (5.2-2) ...
+
+Setting up libreadline5 (5.2-2) ...
+
+Setting up nano (2.0.2-1) ...
 
 Setting up vim-common (7.0-164+1) ...
 
@@ -207,11 +188,7 @@ Setting up vim-tiny (7.0-164+1) ...
 
 Setting up libdevmapper1.02 (1.02.12-1) ...
 
-Setting up passwd (4.0.18.1-6) ...
-
 Setting up make (3.81-3) ...
-Setting up debconf-i18n (1.5.10) ...
-Setting up g++-4.1 (4.1.1-21) ...
 Setting up klogd (1.4.1-20) ...
 Installing new version of config file /etc/init.d/klogd ...
 
@@ -220,15 +197,17 @@ Installing new version of config file /etc/init.d/sysklogd ...
 Installing new version of config file /etc/cron.daily/sysklogd ...
 
 Setting up tasksel-data (2.59) ...
-Setting up perl-modules (5.8.8-7) ...
-Setting up debconf (1.5.10) ...
-
+Setting up debconf-i18n (1.5.11) ...
 Setting up libstdc++6-4.1-dev (4.1.1-21) ...
-Setting up dhcp3-client (3.0.4-12) ...
+Setting up g++-4.1 (4.1.1-21) ...
+Setting up debconf (1.5.11) ...
 
-Setting up tasksel (2.59) ...
+Setting up adduser (3.101) ...
+
+Setting up cron (3.0pl1-100) ...
+Installing new version of config file /etc/crontab ...
 
-Setting up perl (5.8.8-7) ...
+Setting up tasksel (2.59) ...
 
 Reading package lists...
 Building dependency tree...
@@ -243,9 +222,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: 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//16894/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//13151/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.YbrEq21995/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//16894 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13151 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 4a7d21f..dbe8fac 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.16 2006/11/06 20:06:25 lool Exp $
 Reading package lists...
@@ -26,9 +26,9 @@ Get:1 http://ftp.jp.debian.org etch/main libdebian-installer4 0.45 [27.3kB]
 Get:2 http://ftp.jp.debian.org etch/main libdebian-installer-extra4 0.45 [10.2kB]
 Get:3 http://ftp.jp.debian.org etch/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://ftp.jp.debian.org etch/main pbuilder 0.161 [82.6kB]
-Fetched 147kB in 0s (790kB/s)
+Fetched 147kB in 0s (492kB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 12175 files and directories currently installed.)
+(Reading database ... 12199 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.45_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.45_amd64.deb) ...
@@ -63,8 +63,8 @@ The following NEW packages will be installed:
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
 Need to get 3345kB of archives.
 After unpacking 10.9MB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-4 [277kB]
-Get:2 http://ftp.jp.debian.org etch/main file 4.17-4 [32.0kB]
+Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-5 [277kB]
+Get:2 http://ftp.jp.debian.org etch/main file 4.17-5 [32.0kB]
 Get:3 http://ftp.jp.debian.org etch/main html2text 1.3.2a-3 [92.7kB]
 Get:4 http://ftp.jp.debian.org etch/main gettext 0.16.1-1 [2261kB]
 Get:5 http://ftp.jp.debian.org etch/main intltool-debian 0.35.0+20060710.1 [30.8kB]
@@ -72,12 +72,12 @@ Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.7 [106kB]
 Get:7 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:8 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3345kB in 1s (2341kB/s)
+Fetched 3345kB in 1s (1991kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12269 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
+(Reading database ... 12293 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
+Unpacking file (from .../archives/file_4.17-5_amd64.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
@@ -92,9 +92,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.17-4) ...
+Setting up libmagic1 (4.17-5) ...
 
-Setting up file (4.17-4) ...
+Setting up file (4.17-5) ...
 Setting up html2text (1.3.2a-3) ...
 
 Setting up gettext (0.16.1-1) ...
@@ -114,9 +114,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (963kB/s)
+Fetched 97.4kB in 0s (516kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12873 files and directories currently installed.)
+(Reading database ... 12897 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -130,14 +130,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -332,18 +332,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.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 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; \
@@ -356,26 +356,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.YbrEq21995/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -413,8 +413,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -426,7 +426,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 16 03:08:39 UTC 2006
+Tue Dec 26 03:09:17 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
@@ -496,12 +496,11 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 16 03:08:44 UTC 2006
+Tue Dec 26 03:09:22 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
 PASS: tests/segv-catcher.sh
@@ -512,9 +511,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -522,58 +521,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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -595,8 +594,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir3/11108 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir3/7363 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 4eda0ce..ab3786b 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.16 2006/11/06 20:06:25 lool Exp $
 Reading package lists...
@@ -26,9 +26,9 @@ Get:1 http://ftp.jp.debian.org sid/main libdebian-installer4 0.47 [27.1kB]
 Get:2 http://ftp.jp.debian.org sid/main libdebian-installer-extra4 0.47 [10.3kB]
 Get:3 http://ftp.jp.debian.org sid/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://ftp.jp.debian.org sid/main pbuilder 0.161 [82.6kB]
-Fetched 147kB in 0s (248kB/s)
+Fetched 147kB in 0s (366kB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 12191 files and directories currently installed.)
+(Reading database ... 12189 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.47_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.47_amd64.deb) ...
@@ -72,9 +72,9 @@ Get:6 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:8 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3350kB in 1s (2339kB/s)
+Fetched 3350kB in 1s (2043kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12285 files and directories currently installed.)
+(Reading database ... 12283 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-5_amd64.deb) ...
@@ -114,9 +114,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (974kB/s)
+Fetched 97.4kB in 0s (512kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12890 files and directories currently installed.)
+(Reading database ... 12888 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -130,14 +130,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -332,18 +332,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.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 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; \
@@ -356,26 +356,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.YbrEq21995/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -426,7 +426,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 16 03:04:29 UTC 2006
+Tue Dec 26 03:04:43 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
@@ -496,7 +496,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 16 03:04:34 UTC 2006
+Tue Dec 26 03:04:48 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -512,9 +512,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -522,58 +522,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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/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.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/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.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -595,8 +595,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir3/13675 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir3/9836 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index b752c2c..13f2e95 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -7,14 +7,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.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,10 +31,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 16 12:07:39 JST 2006
-pbuilder-time-stamp: 1166238459
+Current time: Tue Dec 26 12:08:15 JST 2006
+pbuilder-time-stamp: 1167102495
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -61,8 +61,8 @@ The following NEW packages will be installed:
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
 Need to get 3345kB of archives.
 After unpacking 10.9MB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-4 [277kB]
-Get:2 http://ftp.jp.debian.org etch/main file 4.17-4 [32.0kB]
+Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-5 [277kB]
+Get:2 http://ftp.jp.debian.org etch/main file 4.17-5 [32.0kB]
 Get:3 http://ftp.jp.debian.org etch/main html2text 1.3.2a-3 [92.7kB]
 Get:4 http://ftp.jp.debian.org etch/main gettext 0.16.1-1 [2261kB]
 Get:5 http://ftp.jp.debian.org etch/main intltool-debian 0.35.0+20060710.1 [30.8kB]
@@ -70,12 +70,12 @@ Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.7 [106kB]
 Get:7 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:8 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3345kB in 1s (2238kB/s)
+Fetched 3345kB in 1s (2004kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12175 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
+(Reading database ... 12199 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
+Unpacking file (from .../archives/file_4.17-5_amd64.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
@@ -90,9 +90,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.17-4) ...
+Setting up libmagic1 (4.17-5) ...
 
-Setting up file (4.17-4) ...
+Setting up file (4.17-5) ...
 Setting up html2text (1.3.2a-3) ...
 
 Setting up gettext (0.16.1-1) ...
@@ -112,9 +112,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (967kB/s)
+Fetched 97.4kB in 0s (511kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12779 files and directories currently installed.)
+(Reading database ... 12803 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -446,11 +446,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 16 03:08:05 UTC 2006
+Tue Dec 26 03:08:42 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -520,14 +520,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 16 03:08:10 UTC 2006
+Tue Dec 26 03:08:47 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
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -633,7 +633,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Dec 16 12:08:11 JST 2006
-pbuilder-time-stamp: 1166238491
+Current time: Tue Dec 26 12:08:49 JST 2006
+pbuilder-time-stamp: 1167102529
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir3/5353 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir3/1469 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 0659806..36eb9c9 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -7,14 +7,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.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,10 +31,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 16 12:03:26 JST 2006
-pbuilder-time-stamp: 1166238206
+Current time: Tue Dec 26 12:03:37 JST 2006
+pbuilder-time-stamp: 1167102217
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -70,9 +70,9 @@ Get:6 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:8 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3350kB in 2s (1634kB/s)
+Fetched 3350kB in 1s (1988kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12191 files and directories currently installed.)
+(Reading database ... 12189 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-5_amd64.deb) ...
@@ -112,9 +112,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (970kB/s)
+Fetched 97.4kB in 0s (549kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12796 files and directories currently installed.)
+(Reading database ... 12794 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -436,9 +436,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -446,11 +446,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 16 03:03:56 UTC 2006
+Tue Dec 26 03:04:07 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -520,14 +520,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 16 03:04:01 UTC 2006
+Tue Dec 26 03:04:12 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
@@ -633,7 +633,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Dec 16 12:04:03 JST 2006
-pbuilder-time-stamp: 1166238243
+Current time: Tue Dec 26 12:04:14 JST 2006
+pbuilder-time-stamp: 1167102254
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.YbrEq21995/dir3/7911 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.HPDuN18066/dir3/3939 and its subdirectories