success, make output changed.

20 files changed, 830 insertions, 798 deletions

diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 6bb77a9..f0a1298 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 10 12:24:29 JST 2005
-pbuilder-time-stamp: 1134185069
+Current time: Wed Dec 14 12:14:01 JST 2005
+pbuilder-time-stamp: 1134530041
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/6310/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/28999/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -37,7 +37,7 @@ The following NEW packages will be installed:
 Need to get 0B/2892kB of archives.
 After unpacking 9572kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11850 files and directories currently installed.)
+(Reading database ... 11881 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -81,17 +81,17 @@ The following NEW packages will be installed:
 Need to get 0B/94.3kB of archives.
 After unpacking 360kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12441 files and directories currently installed.)
+(Reading database ... 12472 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/6310/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/6310/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/28999/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/28999/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -373,7 +373,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -412,7 +411,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 03:25:40 UTC 2005
+Wed Dec 14 03:14:30 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,7 +481,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 10 03:25:45 UTC 2005
+Wed Dec 14 03:14:35 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -611,7 +610,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Dec 10 12:25:47 JST 2005
-pbuilder-time-stamp: 1134185147
+Current time: Wed Dec 14 12:14:37 JST 2005
+pbuilder-time-stamp: 1134530077
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/6310 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/28999 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sarge.log b/testsuite/normal/pbuilder-build-dsh-sarge.log
index 285e1a8..00631f1 100644
--- a/testsuite/normal/pbuilder-build-dsh-sarge.log
+++ b/testsuite/normal/pbuilder-build-dsh-sarge.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 10 12:11:16 JST 2005
-pbuilder-time-stamp: 1134184276
+Current time: Wed Dec 14 12:06:53 JST 2005
+pbuilder-time-stamp: 1134529613
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/26975/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/23210/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -86,12 +86,12 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/26975/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/26975/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/23210/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/23210/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -370,7 +370,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -405,11 +404,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-1: 1
 2: 2
+1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 03:12:22 UTC 2005
+Wed Dec 14 03:07:22 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -479,14 +478,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 10 03:12:27 UTC 2005
+Wed Dec 14 03:07:27 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
-b: b
 a: a
+b: b
+dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -592,7 +591,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Dec 10 12:12:29 JST 2005
-pbuilder-time-stamp: 1134184349
+Current time: Wed Dec 14 12:07:29 JST 2005
+pbuilder-time-stamp: 1134529649
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/26975 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/23210 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 48102e2..4f66590 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 10 12:02:47 JST 2005
-pbuilder-time-stamp: 1134183767
+Current time: Wed Dec 14 12:02:18 JST 2005
+pbuilder-time-stamp: 1134529338
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23828/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/24024/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -37,7 +37,7 @@ The following NEW packages will be installed:
 Need to get 0B/2915kB of archives.
 After unpacking 9609kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11886 files and directories currently installed.)
+(Reading database ... 11895 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -52,7 +52,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.1_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.9_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.10_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -68,7 +68,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.1) ...
-Setting up debhelper (5.0.9) ...
+Setting up debhelper (5.0.10) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -81,17 +81,17 @@ The following NEW packages will be installed:
 Need to get 0B/94.3kB of archives.
 After unpacking 360kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12482 files and directories currently installed.)
+(Reading database ... 12491 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23828/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23828/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/24024/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/24024/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -142,7 +142,7 @@ dpkg-source: building dsh in dsh_0.25.6-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
- ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
+	 ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
 checking for gawk... no
@@ -331,11 +331,11 @@ make[3]: Nothing to be done for `all'.
 make[3]: Leaving directory `/tmp/buildd/dsh-0.25.6/po'
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
-then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
+	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; \
-then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.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-parameter.o -MD -MP -MF ".deps/dsh-parameter.Tpo" -c -o dsh-parameter.o `test -f 'parameter.c' || echo './'`parameter.c; \
-then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
 gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
@@ -373,6 +373,7 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
+dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -398,8 +399,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-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
@@ -411,7 +412,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 03:03:59 UTC 2005
+Wed Dec 14 03:02:57 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -481,7 +482,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 10 03:04:04 UTC 2005
+Wed Dec 14 03:03:02 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -525,14 +526,14 @@ mkdir -p -- /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share
 mkdir -p -- /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
 installing ja.gmo as /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
-  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
-    /usr/bin/install -c -m 644 ./$file \
-		    /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
-  done; \
-else \
-  : ; \
-fi
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
+	    /usr/bin/install -c -m 644 ./$file \
+			    /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
 make[2]: Leaving directory `/tmp/buildd/dsh-0.25.6/po'
 make[2]: Entering directory `/tmp/buildd/dsh-0.25.6'
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.6'
@@ -542,13 +543,13 @@ install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.6/debian/dsh/usr/b
 test -z "/etc/dsh" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/etc/dsh"
  /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
-	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
-	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
-done
+		mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
+			> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
+			> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+	done
 test -z "/usr/share/man/man1" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man1"
  /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
 test -z "/usr/share/man/man5" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man5"
@@ -610,7 +611,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Dec 10 12:04:07 JST 2005
-pbuilder-time-stamp: 1134183847
+Current time: Wed Dec 14 12:03:04 JST 2005
+pbuilder-time-stamp: 1134529384
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir1/23828 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir1/24024 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 17ee65b..c0cf432 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -560,13 +560,13 @@ I: Base system installed successfully.
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//28280/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//19289/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
 Hit http://ftp.jp.debian.org etch Release
 Hit http://ftp.jp.debian.org etch/main Packages
-Fetched 189B in 0s (1663B/s)
+Fetched 189B in 0s (1712B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -592,18 +592,18 @@ The following NEW packages will be installed:
   perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
 Need to get 0B/20.7MB of archives.
-After unpacking 82.3MB of additional disk space will be used.
+After unpacking 82.1MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 7489 files and directories currently installed.)
+(Reading database ... 7502 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20051117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
-Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-2_amd64.deb) ...
+Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package perl-modules.
-Unpacking perl-modules (from .../perl-modules_5.8.7-7_all.deb) ...
+Unpacking perl-modules (from .../perl-modules_5.8.7-9_all.deb) ...
 Selecting previously deselected package perl.
-Unpacking perl (from .../perl_5.8.7-7_amd64.deb) ...
+Unpacking perl (from .../perl_5.8.7-9_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-2_amd64.deb) ...
 Selecting previously deselected package make.
@@ -611,45 +611,45 @@ Unpacking make (from .../make_3.80-11_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
 Unpacking dpkg-dev (from .../dpkg-dev_1.13.11_all.deb) ...
 Selecting previously deselected package gcc-4.0.
-Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-2_amd64.deb) ...
+Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.0.2-1_amd64.deb) ...
-Selecting previously deselected package libstdc++6-4.0-dev.
-Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-2_amd64.deb) ...
-Selecting previously deselected package g++-4.0.
-Unpacking g++-4.0 (from .../g++-4.0_4.0.2-2_amd64.deb) ...
-Selecting previously deselected package g++.
-Unpacking g++ (from .../g++_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
 Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
 Unpacking libc6-dev (from .../libc6-dev_2.3.5-8.1_amd64.deb) ...
+Selecting previously deselected package libstdc++6-4.0-dev.
+Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-5_amd64.deb) ...
+Selecting previously deselected package g++-4.0.
+Unpacking g++-4.0 (from .../g++-4.0_4.0.2-5_amd64.deb) ...
+Selecting previously deselected package g++.
+Unpacking g++ (from .../g++_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.1_amd64.deb) ...
 Setting up binutils (2.16.1cvs20051117-1) ...
 
-Setting up cpp-4.0 (4.0.2-2) ...
+Setting up cpp-4.0 (4.0.2-5) ...
 Setting up cpp (4.0.2-1) ...
 Setting up patch (2.5.9-2) ...
 Setting up make (3.80-11) ...
 
-Setting up gcc-4.0 (4.0.2-2) ...
+Setting up gcc-4.0 (4.0.2-5) ...
 Setting up gcc (4.0.2-1) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
 Setting up libc6-dev (2.3.5-8.1) ...
-Setting up libstdc++6-4.0-dev (4.0.2-2) ...
-Setting up perl-modules (5.8.7-7) ...
-Setting up g++-4.0 (4.0.2-2) ...
-Setting up g++ (4.0.2-1) ...
-
-Setting up perl (5.8.7-7) ...
+Setting up perl-modules (5.8.7-9) ...
+Setting up libstdc++6-4.0-dev (4.0.2-5) ...
+Setting up perl (5.8.7-9) ...
 
 Setting up dpkg-dev (1.13.11) ...
+Setting up g++-4.0 (4.0.2-5) ...
+Setting up g++ (4.0.2-1) ...
+
 Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28280 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19289 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sarge.log b/testsuite/normal/pbuilder-create-sarge.log
index da95033..5cd6a1c 100644
--- a/testsuite/normal/pbuilder-create-sarge.log
+++ b/testsuite/normal/pbuilder-create-sarge.log
@@ -324,12 +324,12 @@ I: Base system installed successfully.
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//15693/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//12603/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Hit http://ftp.jp.debian.org sarge/main Packages
 Get:1 http://ftp.jp.debian.org sarge/main Release [110B]
-Fetched 110B in 0s (1353B/s)
+Fetched 110B in 0s (3685B/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -412,6 +412,6 @@ Setting up build-essential (10.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//15693 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12603 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index ad2046e..90c9deb 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -418,11 +418,11 @@ I: Configuring libnewt0.51...
 I: Configuring gzip...
 I: Configuring dpkg...
 I: Configuring dselect...
+I: Configuring bash...
 I: Configuring login...
 I: Configuring lsb-base...
 I: Configuring passwd...
 I: Configuring initscripts...
-I: Configuring bash...
 I: Configuring sysvinit...
 I: Configuring debconf-i18n...
 I: Configuring debconf...
@@ -559,13 +559,13 @@ I: Base system installed successfully.
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//13465/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//14314/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 189B in 0s (1604B/s)
+Fetched 189B in 0s (2337B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -590,29 +590,29 @@ The following NEW packages will be installed:
   libc6-dev libstdc++6-4.0-dev linux-kernel-headers make patch perl
   perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/20.7MB of archives.
-After unpacking 82.5MB of additional disk space will be used.
+Need to get 0B/20.8MB of archives.
+After unpacking 82.4MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 7507 files and directories currently installed.)
-Unpacking binutils (from .../binutils_2.16.1cvs20051117-1_amd64.deb) ...
+(Reading database ... 7510 files and directories currently installed.)
+Unpacking binutils (from .../binutils_2.16.1cvs20051206-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package cpp.
-Unpacking cpp (from .../cpp_4%3a4.0.2-1_amd64.deb) ...
+Unpacking cpp (from .../cpp_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package perl-modules.
-Unpacking perl-modules (from .../perl-modules_5.8.7-8_all.deb) ...
+Unpacking perl-modules (from .../perl-modules_5.8.7-9_all.deb) ...
 Selecting previously deselected package perl.
-Unpacking perl (from .../perl_5.8.7-8_amd64.deb) ...
+Unpacking perl (from .../perl_5.8.7-9_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-2_amd64.deb) ...
 Selecting previously deselected package make.
-Unpacking make (from .../make_3.80-12_amd64.deb) ...
+Unpacking make (from .../make_3.80+3.81.b3-1_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
 Unpacking dpkg-dev (from .../dpkg-dev_1.13.11_all.deb) ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package gcc.
-Unpacking gcc (from .../gcc_4%3a4.0.2-1_amd64.deb) ...
+Unpacking gcc (from .../gcc_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
 Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
@@ -622,34 +622,36 @@ Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
 Unpacking g++-4.0 (from .../g++-4.0_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package g++.
-Unpacking g++ (from .../g++_4%3a4.0.2-1_amd64.deb) ...
+Unpacking g++ (from .../g++_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.1_amd64.deb) ...
-Setting up binutils (2.16.1cvs20051117-1) ...
+Setting up binutils (2.16.1cvs20051206-1) ...
 
 Setting up cpp-4.0 (4.0.2-5) ...
-Setting up cpp (4.0.2-1) ...
+Setting up cpp (4.0.2-2) ...
+
 Setting up patch (2.5.9-2) ...
-Setting up make (3.80-12) ...
+Setting up make (3.80+3.81.b3-1) ...
 
 Setting up gcc-4.0 (4.0.2-5) ...
-Setting up gcc (4.0.2-1) ...
+Setting up gcc (4.0.2-2) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
 Setting up libc6-dev (2.3.5-8.1) ...
-Setting up perl-modules (5.8.7-8) ...
+Setting up perl-modules (5.8.7-9) ...
 Setting up libstdc++6-4.0-dev (4.0.2-5) ...
-Setting up perl (5.8.7-8) ...
+Setting up perl (5.8.7-9) ...
 
 Setting up dpkg-dev (1.13.11) ...
 Setting up g++-4.0 (4.0.2-5) ...
-Setting up g++ (4.0.2-1) ...
+Setting up g++ (4.0.2-2) ...
 
 Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
- -> new cache content manpages_2.13-1_all.deb added
+ -> new cache content manpages_2.16-1_all.deb added
+ -> new cache content netcat_1.10-29_amd64.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//13465 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14314 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 41cb4a7..d6649c6 100644
--- a/testsuite/normal/pbuilder-execute-etch.log
+++ b/testsuite/normal/pbuilder-execute-etch.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//29055/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16801/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//29055 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16801 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sarge.log b/testsuite/normal/pbuilder-execute-sarge.log
index 89c5f86..36895a3 100644
--- a/testsuite/normal/pbuilder-execute-sarge.log
+++ b/testsuite/normal/pbuilder-execute-sarge.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//17322/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//10944/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//17322 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//10944 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index 2a08c3d..30a7035 100644
--- a/testsuite/normal/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//14218/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//11784/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//14218 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//11784 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index e4b114b..5f5e23e 100644
--- a/testsuite/normal/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//1724/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//19316/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -16,8 +16,8 @@ Get:2 http://ftp.jp.debian.org ../project/experimental Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [115kB]
-Fetched 120kB in 1s (113kB/s)
+Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [121kB]
+Fetched 126kB in 0s (221kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -25,19 +25,34 @@ Reading package lists...
 Building dependency tree...
 The following packages will be REMOVED:
   aptitude tasksel
+The following NEW packages will be installed:
+  gcc-4.1-base
 The following packages will be upgraded:
-  apt apt-utils diff
-3 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
-Need to get 0B/1679kB of archives.
-After unpacking 8610kB disk space will be freed.
-(Reading database ... 11897 files and directories currently installed.)
+  apt apt-utils diff libgcc1 libstdc++6
+5 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0B/2253kB of archives.
+After unpacking 8958kB disk space will be freed.
+(Reading database ... 11906 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 11706 files and directories currently installed.)
+(Reading database ... 11715 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
-(Reading database ... 11714 files and directories currently installed.)
+Selecting previously deselected package gcc-4.1-base.
+(Reading database ... 11723 files and directories currently installed.)
+Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1-0exp4_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.2-5 (using .../libgcc1_1%3a4.1-0exp4_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up gcc-4.1-base (4.1-0exp4) ...
+Setting up libgcc1 (4.1-0exp4) ...
+
+(Reading database ... 11729 files and directories currently installed.)
+Preparing to replace libstdc++6 4.0.2-5 (using .../libstdc++6_4.1-0exp4_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up libstdc++6 (4.1-0exp4) ...
+
+(Reading database ... 11726 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43 (using .../apt-utils_0.6.43exp2_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43 (using .../apt_0.6.43exp2_amd64.deb) ...
@@ -55,6 +70,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//1724 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19316 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index b9985b4..42204e2 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//30617/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//17627/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -12,8 +12,8 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5722B]
-Get:3 http://ftp.jp.debian.org sid/main Packages [3812kB]
-Fetched 3818kB in 2s (1512kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3818kB]
+Fetched 3824kB in 1s (1955kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -22,108 +22,96 @@ Building dependency tree...
 The following NEW packages will be installed:
   libsigc++-2.0-0c2a
 The following packages will be upgraded:
-  adduser apt apt-utils aptitude base-config bsdutils console-data
-  console-tools coreutils cpp-4.0 debconf debconf-i18n dhcp-client findutils
-  g++-4.0 gcc-4.0 gcc-4.0-base initscripts libacl1 libconsole libdb4.2
-  libdb4.3 libgcc1 libssl0.9.8 libstdc++6 libstdc++6-4.0-dev lsb-base make
-  manpages mount nano net-tools perl perl-base perl-modules procps sed sysv-rc
+  apt apt-utils aptitude base-config bash binutils bsdutils console-data
+  coreutils cpp debconf debconf-i18n debianutils dhcp-client e2fslibs
+  e2fsprogs findutils g++ gcc initscripts libacl1 libblkid1 libcomerr2
+  libdb4.2 libdb4.3 libreadline5 libss2 libssl0.9.8 libuuid1 make manpages
+  module-init-tools mount nano netcat procps readline-common sed sysv-rc
   sysvinit tasksel util-linux
-41 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/29.0MB of archives.
-After unpacking 2482kB of additional disk space will be used.
-(Reading database ... 11850 files and directories currently installed.)
-Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-1_amd64.deb) ...
+42 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/18.5MB of archives.
+After unpacking 3228kB of additional disk space will be used.
+(Reading database ... 11881 files and directories currently installed.)
+Preparing to replace debianutils 2.15.1 (using .../debianutils_2.15.2_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.15.2) ...
+
+(Reading database ... 11883 files and directories currently installed.)
+Preparing to replace bash 3.0-17 (using .../archives/bash_3.1-1_amd64.deb) ...
+Unpacking replacement bash ...
+Setting up bash (3.1-1) ...
+Installing new version of config file /etc/bash_completion ...
+
+(Reading database ... 11883 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-2_amd64.deb) ...
 Unpacking replacement bsdutils ...
-Setting up bsdutils (2.12r-1) ...
+Setting up bsdutils (2.12r-2) ...
 
-(Reading database ... 11850 files and directories currently installed.)
+(Reading database ... 11883 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-5_amd64.deb) ...
 Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 No diversion `any diversion of /usr/bin/md5sum.textutils', none removed
 Unpacking replacement coreutils ...
 Setting up coreutils (5.93-5) ...
 
-(Reading database ... 11865 files and directories currently installed.)
+(Reading database ... 11898 files and directories currently installed.)
+Preparing to replace e2fslibs 1.38-2 (using .../e2fslibs_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement e2fslibs ...
+Setting up e2fslibs (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 11898 files and directories currently installed.)
+Preparing to replace e2fsprogs 1.38-2 (using .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement e2fsprogs ...
+Setting up e2fsprogs (1.38+1.39-WIP-2005.12.10-1) ...
+(Reading database ... 11898 files and directories currently installed.)
 Preparing to replace findutils 4.2.25-1 (using .../findutils_4.2.26-2_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.26-2) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11866 files and directories currently installed.)
-Preparing to replace mount 2.12p-8 (using .../mount_2.12r-1_amd64.deb) ...
+(Reading database ... 11899 files and directories currently installed.)
+Preparing to replace mount 2.12p-8 (using .../mount_2.12r-2_amd64.deb) ...
 Unpacking replacement mount ...
-Setting up mount (2.12r-1) ...
+Setting up mount (2.12r-2) ...
 
-(Reading database ... 11866 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.7-7 (using .../perl-modules_5.8.7-8_all.deb) ...
-Unpacking replacement perl-modules ...
-Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
-Unpacking replacement libdb4.3 ...
-Preparing to replace perl 5.8.7-7 (using .../perl_5.8.7-8_amd64.deb) ...
-Unpacking replacement perl ...
-Preparing to replace perl-base 5.8.7-7 (using .../perl-base_5.8.7-8_amd64.deb) ...
-Unpacking replacement perl-base ...
-Setting up perl-base (5.8.7-8) ...
-(Reading database ... 11864 files and directories currently installed.)
-Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
+(Reading database ... 11899 files and directories currently installed.)
+Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-5_amd64.deb) ...
 Unpacking replacement sed ...
-Setting up sed (4.1.4-4) ...
+Setting up sed (4.1.4-5) ...
 
-(Reading database ... 11865 files and directories currently installed.)
+(Reading database ... 11900 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-6) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11865 files and directories currently installed.)
-Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-1_amd64.deb) ...
+(Reading database ... 11900 files and directories currently installed.)
+Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-2_amd64.deb) ...
 Unpacking replacement util-linux ...
-Setting up util-linux (2.12r-1) ...
+Setting up util-linux (2.12r-2) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11865 files and directories currently installed.)
+(Reading database ... 11900 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.4.59 (using .../debconf-i18n_1.4.62_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.59 (using .../debconf_1.4.62_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace libstdc++6-4.0-dev 4.0.2-2 (using .../libstdc++6-4.0-dev_4.0.2-5_amd64.deb) ...
-Unpacking replacement libstdc++6-4.0-dev ...
-Preparing to replace g++-4.0 4.0.2-2 (using .../g++-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement g++-4.0 ...
-Preparing to replace gcc-4.0 4.0.2-2 (using .../gcc-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement gcc-4.0 ...
-Preparing to replace cpp-4.0 4.0.2-2 (using .../cpp-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement cpp-4.0 ...
-Preparing to replace libgcc1 1:4.0.2-2 (using .../libgcc1_1%3a4.0.2-5_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up libgcc1 (4.0.2-5) ...
-
-(Reading database ... 11887 files and directories currently installed.)
-Preparing to replace gcc-4.0-base 4.0.2-2 (using .../gcc-4.0-base_4.0.2-5_amd64.deb) ...
-Unpacking replacement gcc-4.0-base ...
-Preparing to replace libstdc++6 4.0.2-2 (using .../libstdc++6_4.0.2-5_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up gcc-4.0-base (4.0.2-5) ...
-Setting up libstdc++6 (4.0.2-5) ...
-
-(Reading database ... 11887 files and directories currently installed.)
+Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
 Preparing to replace apt-utils 0.6.42.2 (using .../apt-utils_0.6.43_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Selecting previously deselected package libsigc++-2.0-0c2a.
 Unpacking libsigc++-2.0-0c2a (from .../libsigc++-2.0-0c2a_2.0.16-2_amd64.deb) ...
-Preparing to replace aptitude 0.2.15.9-7 (using .../aptitude_0.4.0-5_amd64.deb) ...
+Preparing to replace aptitude 0.2.15.9-7 (using .../aptitude_0.4.1-1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace apt 0.6.42.2 (using .../archives/apt_0.6.43_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.43) ...
 
-(Reading database ... 11901 files and directories currently installed.)
-Preparing to replace lsb-base 3.0-11 (using .../lsb-base_3.0-12_all.deb) ...
-Unpacking replacement lsb-base ...
+(Reading database ... 11916 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement initscripts ...
-Setting up lsb-base (3.0-12) ...
 Setting up initscripts (2.86.ds1-6) ...
 Installing new version of config file /etc/init.d/bootclean.sh ...
 Installing new version of config file /etc/init.d/bootlogd ...
@@ -144,93 +132,122 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/umountroot ...
 Installing new version of config file /etc/init.d/urandom ...
 
-(Reading database ... 11902 files and directories currently installed.)
+(Reading database ... 11917 files and directories currently installed.)
 Preparing to replace libacl1 2.2.32-1 (using .../libacl1_2.2.34-1_amd64.deb) ...
 Unpacking replacement libacl1 ...
 Setting up libacl1 (2.2.34-1) ...
 
-(Reading database ... 11902 files and directories currently installed.)
+(Reading database ... 11917 files and directories currently installed.)
+Preparing to replace libblkid1 1.38-2 (using .../libblkid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libblkid1 ...
+Setting up libblkid1 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 11917 files and directories currently installed.)
+Preparing to replace libcomerr2 1.38-2 (using .../libcomerr2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libcomerr2 ...
+Setting up libcomerr2 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 11917 files and directories currently installed.)
+Preparing to replace libss2 1.38-2 (using .../libss2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libss2 ...
+Setting up libss2 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 11917 files and directories currently installed.)
+Preparing to replace libuuid1 1.38-2 (using .../libuuid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libuuid1 ...
+Setting up libuuid1 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 11917 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-6_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-6) ...
 
-(Reading database ... 11902 files and directories currently installed.)
-Preparing to replace adduser 3.79 (using .../archives/adduser_3.80_all.deb) ...
-Unpacking replacement adduser ...
+(Reading database ... 11917 files and directories currently installed.)
 Preparing to replace console-data 2002.12.04dbs-50 (using .../console-data_2002.12.04dbs-52_all.deb) ...
 Unpacking replacement console-data ...
-Preparing to replace console-tools 1:0.2.3dbs-58 (using .../console-tools_1%3a0.2.3dbs-60_amd64.deb) ...
-Unpacking replacement console-tools ...
-Preparing to replace libconsole 1:0.2.3dbs-58 (using .../libconsole_1%3a0.2.3dbs-60_amd64.deb) ...
-Unpacking replacement libconsole ...
 Preparing to replace base-config 2.73 (using .../base-config_2.74_all.deb) ...
 Unpacking replacement base-config ...
 Preparing to replace dhcp-client 2.0pl5-19.1 (using .../dhcp-client_2.0pl5-19.4_amd64.deb) ...
 Unpacking replacement dhcp-client ...
 Preparing to replace libssl0.9.8 0.9.8a-3 (using .../libssl0.9.8_0.9.8a-4_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
-Preparing to replace manpages 2.10-1 (using .../manpages_2.13-1_all.deb) ...
+Preparing to replace manpages 2.10-1 (using .../manpages_2.16-1_all.deb) ...
 Unpacking replacement manpages ...
+Preparing to replace module-init-tools 3.2-pre9-4 (using .../module-init-tools_3.2.2-1_amd64.deb) ...
+Unpacking replacement module-init-tools ...
 Preparing to replace nano 1.3.8-2 (using .../nano_1.3.9-1_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace net-tools 1.60-16 (using .../net-tools_1.60-17_amd64.deb) ...
-Unpacking replacement net-tools ...
+Preparing to replace netcat 1.10-27 (using .../netcat_1.10-29_amd64.deb) ...
+Unpacking replacement netcat ...
 Preparing to replace tasksel 2.33 (using .../archives/tasksel_2.37_all.deb) ...
 Unpacking replacement tasksel ...
 Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace make 3.80-11 (using .../make_3.80-12_amd64.deb) ...
+Preparing to replace binutils 2.16.1cvs20051117-1 (using .../binutils_2.16.1cvs20051206-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace cpp 4:4.0.2-1 (using .../cpp_4%3a4.0.2-2_amd64.deb) ...
+Unpacking replacement cpp ...
+Preparing to replace gcc 4:4.0.2-1 (using .../gcc_4%3a4.0.2-2_amd64.deb) ...
+Removing old gcc doc directory.
+Unpacking replacement gcc ...
+Preparing to replace g++ 4:4.0.2-1 (using .../g++_4%3a4.0.2-2_amd64.deb) ...
+Unpacking replacement g++ ...
+Preparing to replace readline-common 5.0-11 (using .../readline-common_5.1-2_all.deb) ...
+Unpacking replacement readline-common ...
+Preparing to replace libreadline5 5.0-11 (using .../libreadline5_5.1-2_amd64.deb) ...
+Unpacking replacement libreadline5 ...
+Preparing to replace make 3.80-11 (using .../make_3.80+3.81.b3-1_amd64.deb) ...
 Unpacking replacement make ...
-Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
+Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-21_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Setting up libdb4.3 (4.3.29-1) ...
-Setting up cpp-4.0 (4.0.2-5) ...
-Setting up gcc-4.0 (4.0.2-5) ...
 Setting up apt-utils (0.6.43) ...
 
 Setting up libsigc++-2.0-0c2a (2.0.16-2) ...
 
-Setting up aptitude (0.4.0-5) ...
-
-Setting up libconsole (0.2.3dbs-60) ...
+Setting up aptitude (0.4.1-1) ...
 
 Setting up dhcp-client (2.0pl5-19.4) ...
 Installing new version of config file /etc/dhclient-script ...
 
-Setting up manpages (2.13-1) ...
+Setting up manpages (2.16-1) ...
+Setting up module-init-tools (3.2.2-1) ...
+
 Setting up nano (1.3.9-1) ...
 
-Setting up net-tools (1.60-17) ...
+Setting up netcat (1.10-29) ...
 Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
 
-Setting up make (3.80-12) ...
+Setting up binutils (2.16.1cvs20051206-1) ...
+
+Setting up cpp (4.0.2-2) ...
+
+Setting up gcc (4.0.2-2) ...
+
+Setting up g++ (4.0.2-2) ...
+
+Setting up readline-common (5.1-2) ...
 
-Setting up libdb4.2 (4.2.52-20) ...
+Setting up libreadline5 (5.1-2) ...
+
+Setting up make (3.80+3.81.b3-1) ...
+
+Setting up libdb4.2 (4.2.52-21) ...
 Setting up debconf-i18n (1.4.62) ...
-Setting up libstdc++6-4.0-dev (4.0.2-5) ...
-Setting up perl-modules (5.8.7-8) ...
 Setting up debconf (1.4.62) ...
 
-Setting up g++-4.0 (4.0.2-5) ...
-Setting up adduser (3.80) ...
-
 Setting up console-data (2002.12.04dbs-52) ...
 Looking for keymap to install:
 NONE
 
-Setting up console-tools (0.2.3dbs-60) ...
-Installing new version of config file /etc/init.d/console-screen.sh ...
-
 Setting up base-config (2.74) ...
 
 Setting up libssl0.9.8 (0.9.8a-4) ...
 
 Setting up tasksel (2.37) ...
 
-Setting up perl (5.8.7-8) ...
-
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -240,6 +257,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//30617 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//17627 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
index 868d568..2176215 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//26705/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//18345/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,8 +18,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [115kB]
-Fetched 120kB in 0s (283kB/s)
+Get:4 http://ftp.jp.debian.org ../project/experimental/main Packages [121kB]
+Fetched 126kB in 0s (385kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -30,21 +30,40 @@ Reading package lists...
 Building dependency tree...
 The following packages will be REMOVED:
   aptitude tasksel
+The following NEW packages will be installed:
+  gcc-4.1-base
 The following packages will be upgraded:
-  apt apt-utils diff
-3 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
-Need to get 0B/1679kB of archives.
-After unpacking 8610kB disk space will be freed.
+  apt apt-utils diff libgcc1 libstdc++6
+5 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
+Need to get 574kB/2253kB of archives.
+After unpacking 8958kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
-  diff apt-utils apt
-(Reading database ... 12512 files and directories currently installed.)
+  diff gcc-4.1-base libgcc1 libstdc++6 apt-utils apt
+Get:1 http://ftp.jp.debian.org ../project/experimental/main gcc-4.1-base 4.1-0exp4 [183kB]
+Get:2 http://ftp.jp.debian.org ../project/experimental/main libgcc1 1:4.1-0exp4 [98.9kB]
+Get:3 http://ftp.jp.debian.org ../project/experimental/main libstdc++6 4.1-0exp4 [292kB]
+Fetched 574kB in 0s (1216kB/s)
+(Reading database ... 12520 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 12321 files and directories currently installed.)
+(Reading database ... 12329 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
-(Reading database ... 12329 files and directories currently installed.)
+Selecting previously deselected package gcc-4.1-base.
+(Reading database ... 12337 files and directories currently installed.)
+Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1-0exp4_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.2-5 (using .../libgcc1_1%3a4.1-0exp4_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up gcc-4.1-base (4.1-0exp4) ...
+Setting up libgcc1 (4.1-0exp4) ...
+
+(Reading database ... 12343 files and directories currently installed.)
+Preparing to replace libstdc++6 4.0.2-5 (using .../libstdc++6_4.1-0exp4_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up libstdc++6 (4.1-0exp4) ...
+
+(Reading database ... 12340 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43 (using .../apt-utils_0.6.43exp2_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43 (using .../apt_0.6.43exp2_amd64.deb) ...
@@ -60,8 +79,11 @@ dpkg-dev is already the newest version.
 apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Copying back the cached apt archive contents
+ -> new cache content gcc-4.1-base_4.1-0exp4_amd64.deb added
+ -> new cache content libgcc1_1%3a4.1-0exp4_amd64.deb added
+ -> new cache content libstdc++6_4.1-0exp4_amd64.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//26705 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//18345 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid.log b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
index ae2ee32..495bfb0 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//24377/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16720/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -13,8 +13,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3812kB]
-Fetched 3818kB in 2s (1649kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3818kB]
+Fetched 3824kB in 2s (1857kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -25,119 +25,104 @@ Building dependency tree...
 The following NEW packages will be installed:
   libpcap0.8 libsigc++-2.0-0c2a
 The following packages will be upgraded:
-  adduser apt apt-utils aptitude base-config bsdutils console-data
-  console-tools coreutils cpp-3.3 cpp-4.0 debconf debconf-i18n dhcp-client
-  findutils g++-3.3 g++-4.0 gcc-3.3 gcc-3.3-base gcc-4.0 gcc-4.0-base
-  initscripts libacl1 libconsole libdb4.2 libdb4.3 libgcc1 libpcre3 libperl5.8
-  libssl0.9.8 libstdc++5 libstdc++5-3.3-dev libstdc++6 libstdc++6-4.0-dev
-  lsb-base make manpages mount nano net-tools perl perl-base perl-modules ppp
-  procps sed sysv-rc sysvinit tasksel util-linux
-50 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/36.0MB of archives.
-After unpacking 2621kB of additional disk space will be used.
+  apt apt-utils aptitude base-config bash binutils bsdutils console-data
+  coreutils cpp debconf debconf-i18n debianutils dhcp-client e2fslibs
+  e2fsprogs findutils g++ gcc initscripts libacl1 libblkid1 libcomerr2
+  libdb4.2 libdb4.3 libss2 libssl0.9.8 libuuid1 make manpages mount nano
+  pciutils ppp procps sed sysv-rc sysvinit tasksel util-linux
+40 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Need to get 167kB/18.7MB of archives.
+After unpacking 3387kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  bsdutils coreutils findutils mount perl-modules libdb4.3 perl libperl5.8
-  perl-base sed sysvinit util-linux debconf-i18n debconf libstdc++6-4.0-dev
-  g++-4.0 gcc-4.0 cpp-4.0 libgcc1 gcc-4.0-base libstdc++6 apt-utils
-  libsigc++-2.0-0c2a aptitude apt lsb-base initscripts libacl1 sysv-rc adduser
-  console-data console-tools libconsole base-config dhcp-client libssl0.9.8
-  manpages nano net-tools tasksel procps libpcre3 make gcc-3.3-base cpp-3.3
-  gcc-3.3 libstdc++5 libstdc++5-3.3-dev g++-3.3 libdb4.2 libpcap0.8 ppp
-(Reading database ... 12458 files and directories currently installed.)
-Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-1_amd64.deb) ...
+  debianutils bash bsdutils coreutils e2fslibs e2fsprogs findutils mount sed
+  sysvinit util-linux debconf-i18n debconf libdb4.3 apt-utils
+  libsigc++-2.0-0c2a aptitude apt initscripts libacl1 libblkid1 libcomerr2
+  libss2 libuuid1 sysv-rc console-data base-config dhcp-client libssl0.9.8
+  manpages nano tasksel procps binutils cpp gcc g++ make libdb4.2 libpcap0.8
+  pciutils ppp
+Get:1 http://ftp.jp.debian.org sid/main pciutils 1:2.1.11-15.3 [167kB]
+Fetched 167kB in 0s (310kB/s)
+(Reading database ... 12487 files and directories currently installed.)
+Preparing to replace debianutils 2.15.1 (using .../debianutils_2.15.2_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.15.2) ...
+
+(Reading database ... 12489 files and directories currently installed.)
+Preparing to replace bash 3.0-17 (using .../archives/bash_3.1-1_amd64.deb) ...
+Unpacking replacement bash ...
+Setting up bash (3.1-1) ...
+Installing new version of config file /etc/bash_completion ...
+
+(Reading database ... 12489 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12p-8 (using .../bsdutils_1%3a2.12r-2_amd64.deb) ...
 Unpacking replacement bsdutils ...
-Setting up bsdutils (2.12r-1) ...
+Setting up bsdutils (2.12r-2) ...
 
-(Reading database ... 12458 files and directories currently installed.)
+(Reading database ... 12489 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-5_amd64.deb) ...
 Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 Removing `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Unpacking replacement coreutils ...
 Setting up coreutils (5.93-5) ...
 
-(Reading database ... 12472 files and directories currently installed.)
+(Reading database ... 12503 files and directories currently installed.)
+Preparing to replace e2fslibs 1.38-2 (using .../e2fslibs_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement e2fslibs ...
+Setting up e2fslibs (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 12503 files and directories currently installed.)
+Preparing to replace e2fsprogs 1.38-2 (using .../e2fsprogs_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement e2fsprogs ...
+Setting up e2fsprogs (1.38+1.39-WIP-2005.12.10-1) ...
+(Reading database ... 12503 files and directories currently installed.)
 Preparing to replace findutils 4.2.25-1 (using .../findutils_4.2.26-2_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.26-2) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 12473 files and directories currently installed.)
-Preparing to replace mount 2.12p-8 (using .../mount_2.12r-1_amd64.deb) ...
+(Reading database ... 12504 files and directories currently installed.)
+Preparing to replace mount 2.12p-8 (using .../mount_2.12r-2_amd64.deb) ...
 Unpacking replacement mount ...
-Setting up mount (2.12r-1) ...
+Setting up mount (2.12r-2) ...
 
-(Reading database ... 12473 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.7-7 (using .../perl-modules_5.8.7-8_all.deb) ...
-Unpacking replacement perl-modules ...
-Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
-Unpacking replacement libdb4.3 ...
-Preparing to replace perl 5.8.7-7 (using .../perl_5.8.7-8_amd64.deb) ...
-Unpacking replacement perl ...
-Preparing to replace libperl5.8 5.8.7-7 (using .../libperl5.8_5.8.7-8_amd64.deb) ...
-Unpacking replacement libperl5.8 ...
-Preparing to replace perl-base 5.8.7-7 (using .../perl-base_5.8.7-8_amd64.deb) ...
-Unpacking replacement perl-base ...
-Setting up perl-base (5.8.7-8) ...
-(Reading database ... 12471 files and directories currently installed.)
-Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
+(Reading database ... 12504 files and directories currently installed.)
+Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-5_amd64.deb) ...
 Unpacking replacement sed ...
-Setting up sed (4.1.4-4) ...
+Setting up sed (4.1.4-5) ...
 
-(Reading database ... 12472 files and directories currently installed.)
+(Reading database ... 12505 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-6) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12472 files and directories currently installed.)
-Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-1_amd64.deb) ...
+(Reading database ... 12505 files and directories currently installed.)
+Preparing to replace util-linux 2.12p-8 (using .../util-linux_2.12r-2_amd64.deb) ...
 Unpacking replacement util-linux ...
-Setting up util-linux (2.12r-1) ...
+Setting up util-linux (2.12r-2) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 12472 files and directories currently installed.)
+(Reading database ... 12505 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.4.59 (using .../debconf-i18n_1.4.62_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.59 (using .../debconf_1.4.62_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace libstdc++6-4.0-dev 4.0.2-2 (using .../libstdc++6-4.0-dev_4.0.2-5_amd64.deb) ...
-Unpacking replacement libstdc++6-4.0-dev ...
-Preparing to replace g++-4.0 4.0.2-2 (using .../g++-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement g++-4.0 ...
-Preparing to replace gcc-4.0 4.0.2-2 (using .../gcc-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement gcc-4.0 ...
-Preparing to replace cpp-4.0 4.0.2-2 (using .../cpp-4.0_4.0.2-5_amd64.deb) ...
-Unpacking replacement cpp-4.0 ...
-Preparing to replace libgcc1 1:4.0.2-2 (using .../libgcc1_1%3a4.0.2-5_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up libgcc1 (4.0.2-5) ...
-
-(Reading database ... 12494 files and directories currently installed.)
-Preparing to replace gcc-4.0-base 4.0.2-2 (using .../gcc-4.0-base_4.0.2-5_amd64.deb) ...
-Unpacking replacement gcc-4.0-base ...
-Preparing to replace libstdc++6 4.0.2-2 (using .../libstdc++6_4.0.2-5_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up gcc-4.0-base (4.0.2-5) ...
-Setting up libstdc++6 (4.0.2-5) ...
-
-(Reading database ... 12494 files and directories currently installed.)
+Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
+Unpacking replacement libdb4.3 ...
 Preparing to replace apt-utils 0.6.42.2 (using .../apt-utils_0.6.43_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Selecting previously deselected package libsigc++-2.0-0c2a.
 Unpacking libsigc++-2.0-0c2a (from .../libsigc++-2.0-0c2a_2.0.16-2_amd64.deb) ...
-Preparing to replace aptitude 0.2.15.9-7 (using .../aptitude_0.4.0-5_amd64.deb) ...
+Preparing to replace aptitude 0.2.15.9-7 (using .../aptitude_0.4.1-1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace apt 0.6.42.2 (using .../archives/apt_0.6.43_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.43) ...
 
-(Reading database ... 12508 files and directories currently installed.)
-Preparing to replace lsb-base 3.0-11 (using .../lsb-base_3.0-12_all.deb) ...
-Unpacking replacement lsb-base ...
+(Reading database ... 12521 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-6_amd64.deb) ...
 Unpacking replacement initscripts ...
-Setting up lsb-base (3.0-12) ...
 Setting up initscripts (2.86.ds1-6) ...
 Installing new version of config file /etc/init.d/bootclean.sh ...
 Installing new version of config file /etc/init.d/bootlogd ...
@@ -158,127 +143,120 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/umountroot ...
 Installing new version of config file /etc/init.d/urandom ...
 
-(Reading database ... 12509 files and directories currently installed.)
+(Reading database ... 12522 files and directories currently installed.)
 Preparing to replace libacl1 2.2.32-1 (using .../libacl1_2.2.34-1_amd64.deb) ...
 Unpacking replacement libacl1 ...
 Setting up libacl1 (2.2.34-1) ...
 
-(Reading database ... 12509 files and directories currently installed.)
+(Reading database ... 12522 files and directories currently installed.)
+Preparing to replace libblkid1 1.38-2 (using .../libblkid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libblkid1 ...
+Setting up libblkid1 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 12522 files and directories currently installed.)
+Preparing to replace libcomerr2 1.38-2 (using .../libcomerr2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libcomerr2 ...
+Setting up libcomerr2 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 12522 files and directories currently installed.)
+Preparing to replace libss2 1.38-2 (using .../libss2_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libss2 ...
+Setting up libss2 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 12522 files and directories currently installed.)
+Preparing to replace libuuid1 1.38-2 (using .../libuuid1_1.38+1.39-WIP-2005.12.10-1_amd64.deb) ...
+Unpacking replacement libuuid1 ...
+Setting up libuuid1 (1.38+1.39-WIP-2005.12.10-1) ...
+
+(Reading database ... 12522 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-6_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-6) ...
 
-(Reading database ... 12509 files and directories currently installed.)
-Preparing to replace adduser 3.79 (using .../archives/adduser_3.80_all.deb) ...
-Unpacking replacement adduser ...
+(Reading database ... 12522 files and directories currently installed.)
 Preparing to replace console-data 2002.12.04dbs-50 (using .../console-data_2002.12.04dbs-52_all.deb) ...
 Unpacking replacement console-data ...
-Preparing to replace console-tools 1:0.2.3dbs-58 (using .../console-tools_1%3a0.2.3dbs-60_amd64.deb) ...
-Unpacking replacement console-tools ...
-Preparing to replace libconsole 1:0.2.3dbs-58 (using .../libconsole_1%3a0.2.3dbs-60_amd64.deb) ...
-Unpacking replacement libconsole ...
 Preparing to replace base-config 2.73 (using .../base-config_2.74_all.deb) ...
 Unpacking replacement base-config ...
 Preparing to replace dhcp-client 2.0pl5-19.1 (using .../dhcp-client_2.0pl5-19.4_amd64.deb) ...
 Unpacking replacement dhcp-client ...
 Preparing to replace libssl0.9.8 0.9.8a-3 (using .../libssl0.9.8_0.9.8a-4_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
-Preparing to replace manpages 2.10-1 (using .../manpages_2.13-1_all.deb) ...
+Preparing to replace manpages 2.10-1 (using .../manpages_2.16-1_all.deb) ...
 Unpacking replacement manpages ...
 Preparing to replace nano 1.3.8-2 (using .../nano_1.3.9-1_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace net-tools 1.60-16 (using .../net-tools_1.60-17_amd64.deb) ...
-Unpacking replacement net-tools ...
 Preparing to replace tasksel 2.33 (using .../archives/tasksel_2.37_all.deb) ...
 Unpacking replacement tasksel ...
 Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace libpcre3 6.4-1 (using .../libpcre3_6.4-1.1_amd64.deb) ...
-Unpacking replacement libpcre3 ...
-Preparing to replace make 3.80-11 (using .../make_3.80-12_amd64.deb) ...
+Preparing to replace binutils 2.16.1cvs20051117-1 (using .../binutils_2.16.1cvs20051206-1_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace cpp 4:4.0.2-1 (using .../cpp_4%3a4.0.2-2_amd64.deb) ...
+Unpacking replacement cpp ...
+Preparing to replace gcc 4:4.0.2-1 (using .../gcc_4%3a4.0.2-2_amd64.deb) ...
+Removing old gcc doc directory.
+Unpacking replacement gcc ...
+Preparing to replace g++ 4:4.0.2-1 (using .../g++_4%3a4.0.2-2_amd64.deb) ...
+Unpacking replacement g++ ...
+Preparing to replace make 3.80-11 (using .../make_3.80+3.81.b3-1_amd64.deb) ...
 Unpacking replacement make ...
-Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement gcc-3.3-base ...
-Preparing to replace cpp-3.3 1:3.3.6-7 (using .../cpp-3.3_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement cpp-3.3 ...
-Preparing to replace gcc-3.3 1:3.3.6-7 (using .../gcc-3.3_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement gcc-3.3 ...
-Preparing to replace libstdc++5 1:3.3.6-7 (using .../libstdc++5_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement libstdc++5 ...
-Preparing to replace libstdc++5-3.3-dev 1:3.3.6-7 (using .../libstdc++5-3.3-dev_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement libstdc++5-3.3-dev ...
-Preparing to replace g++-3.3 1:3.3.6-7 (using .../g++-3.3_1%3a3.3.6-10_amd64.deb) ...
-Unpacking replacement g++-3.3 ...
-Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
+Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-21_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Selecting previously deselected package libpcap0.8.
 Unpacking libpcap0.8 (from .../libpcap0.8_0.9.4-1_amd64.deb) ...
+Preparing to replace pciutils 1:2.1.11-15.1 (using .../pciutils_1%3a2.1.11-15.3_amd64.deb) ...
+Unpacking replacement pciutils ...
 Preparing to replace ppp 2.4.3-20050321+2 (using .../ppp_2.4.4b1-1_amd64.deb) ...
 Unpacking replacement ppp ...
 Setting up libdb4.3 (4.3.29-1) ...
-Setting up libperl5.8 (5.8.7-8) ...
-
-Setting up cpp-4.0 (4.0.2-5) ...
-Setting up gcc-4.0 (4.0.2-5) ...
 Setting up apt-utils (0.6.43) ...
 
 Setting up libsigc++-2.0-0c2a (2.0.16-2) ...
 
-Setting up aptitude (0.4.0-5) ...
-
-Setting up libconsole (0.2.3dbs-60) ...
+Setting up aptitude (0.4.1-1) ...
 
 Setting up dhcp-client (2.0pl5-19.4) ...
 Installing new version of config file /etc/dhclient-script ...
 
-Setting up manpages (2.13-1) ...
+Setting up manpages (2.16-1) ...
 Setting up nano (1.3.9-1) ...
 
-Setting up net-tools (1.60-17) ...
 Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
 
-Setting up libpcre3 (6.4-1.1) ...
+Setting up binutils (2.16.1cvs20051206-1) ...
+
+Setting up cpp (4.0.2-2) ...
+
+Setting up gcc (4.0.2-2) ...
 
-Setting up make (3.80-12) ...
+Setting up g++ (4.0.2-2) ...
 
-Setting up gcc-3.3-base (3.3.6-10) ...
-Setting up cpp-3.3 (3.3.6-10) ...
-Setting up gcc-3.3 (3.3.6-10) ...
-Setting up libstdc++5 (3.3.6-10) ...
+Setting up make (3.80+3.81.b3-1) ...
 
-Setting up libdb4.2 (4.2.52-20) ...
+Setting up libdb4.2 (4.2.52-21) ...
 Setting up libpcap0.8 (0.9.4-1) ...
 
+Setting up pciutils (2.1.11-15.3) ...
+
 Setting up ppp (2.4.4b1-1) ...
 Installing new version of config file /etc/init.d/pppd-dns ...
 
 Setting up debconf-i18n (1.4.62) ...
-Setting up libstdc++6-4.0-dev (4.0.2-5) ...
-Setting up libstdc++5-3.3-dev (3.3.6-10) ...
-Setting up perl-modules (5.8.7-8) ...
 Setting up debconf (1.4.62) ...
 
-Setting up g++-4.0 (4.0.2-5) ...
-Setting up adduser (3.80) ...
-
 Setting up console-data (2002.12.04dbs-52) ...
 Looking for keymap to install:
 NONE
 
-Setting up console-tools (0.2.3dbs-60) ...
-Installing new version of config file /etc/init.d/console-screen.sh ...
-
 Setting up base-config (2.74) ...
 
 Setting up libssl0.9.8 (0.9.8a-4) ...
 
 Setting up tasksel (2.37) ...
 
-Setting up g++-3.3 (3.3.6-10) ...
-Setting up perl (5.8.7-8) ...
-
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -286,8 +264,9 @@ dpkg-dev is already the newest version.
 apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Copying back the cached apt archive contents
+ -> new cache content pciutils_1%3a2.1.11-15.3_amd64.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24377 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16720 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch.log b/testsuite/normal/pbuilder-update-sarge-etch.log
index c369cbf..875db9b 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch.log
@@ -1,18 +1,18 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//18789/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//11759/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3505kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3523kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3505kB in 2s (1690kB/s)
+Fetched 3523kB in 1s (1884kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -43,7 +43,7 @@ The following packages will be upgraded:
   sysvinit tar tasksel telnet util-linux wget whiptail zlib1g
 115 upgraded, 17 newly installed, 1 to remove and 0 not upgraded.
 Need to get 0B/62.0MB of archives.
-After unpacking 34.8MB of additional disk space will be used.
+After unpacking 34.6MB of additional disk space will be used.
 (Reading database ... 10950 files and directories currently installed.)
 Preparing to replace linux-kernel-headers 2.5.999-test7-bk-17 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
 Unpacking replacement linux-kernel-headers ...
@@ -74,22 +74,22 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-8.1) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Sat Dec 10 03:17:06 UTC 2005.
-Universal Time is now:  Sat Dec 10 03:17:06 UTC 2005.
+Local time is now:      Wed Dec 14 03:09:22 UTC 2005.
+Universal Time is now:  Wed Dec 14 03:09:22 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11284 files and directories currently installed.)
-Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.0.2-2_amd64.deb) ...
+Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.0.2-5_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up libgcc1 (4.0.2-2) ...
+Setting up libgcc1 (4.0.2-5) ...
 
 Selecting previously deselected package gcc-4.0-base.
 (Reading database ... 11285 files and directories currently installed.)
-Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-2_amd64.deb) ...
+Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package libstdc++6.
-Unpacking libstdc++6 (from .../libstdc++6_4.0.2-2_amd64.deb) ...
-Setting up gcc-4.0-base (4.0.2-2) ...
-Setting up libstdc++6 (4.0.2-2) ...
+Unpacking libstdc++6 (from .../libstdc++6_4.0.2-5_amd64.deb) ...
+Setting up gcc-4.0-base (4.0.2-5) ...
+Setting up libstdc++6 (4.0.2-5) ...
 
 (Reading database ... 11297 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.42.2_amd64.deb) ...
@@ -151,7 +151,7 @@ Preparing to replace liblzo1 1.08-1.2 (using .../liblzo1_1.08-2_amd64.deb) ...
 Unpacking replacement liblzo1 ...
 Selecting previously deselected package libgnutls12.
 Unpacking libgnutls12 (from .../libgnutls12_1.2.9-2_amd64.deb) ...
-Preparing to replace libpcre3 4.5-1.2 (using .../libpcre3_6.4-1_amd64.deb) ...
+Preparing to replace libpcre3 4.5-1.2 (using .../libpcre3_6.4-1.1_amd64.deb) ...
 Unpacking replacement libpcre3 ...
 Preparing to replace exim4-daemon-light 4.50-8 (using .../exim4-daemon-light_4.60-1_amd64.deb) ...
 Unpacking replacement exim4-daemon-light ...
@@ -159,27 +159,29 @@ Selecting previously deselected package libselinux1.
 Unpacking libselinux1 (from .../libselinux1_1.26-1_amd64.deb) ...
 Setting up libselinux1 (1.26-1) ...
 
-(Reading database ... 11327 files and directories currently installed.)
+(Reading database ... 11325 files and directories currently installed.)
 Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3_all.deb) ...
 Unpacking replacement libpam-runtime ...
 Setting up libpam-runtime (0.79-3) ...
 Installing new version of config file /etc/pam.conf ...
 
-(Reading database ... 11327 files and directories currently installed.)
+(Reading database ... 11325 files and directories currently installed.)
 Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3_amd64.deb) ...
 Unpacking replacement libpam0g ...
 Setting up libpam0g (0.79-3) ...
 
-(Reading database ... 11327 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.4-8 (using .../perl-modules_5.8.7-7_all.deb) ...
+(Reading database ... 11325 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.4-8 (using .../perl-modules_5.8.7-9_all.deb) ...
 Unpacking replacement perl-modules ...
-Preparing to replace perl 5.8.4-8 (using .../perl_5.8.7-7_amd64.deb) ...
+Selecting previously deselected package libdb4.3.
+Unpacking libdb4.3 (from .../libdb4.3_4.3.28-2_amd64.deb) ...
+Preparing to replace perl 5.8.4-8 (using .../perl_5.8.7-9_amd64.deb) ...
 Unpacking replacement perl ...
-Preparing to replace libperl5.8 5.8.4-8 (using .../libperl5.8_5.8.7-7_amd64.deb) ...
+Preparing to replace libperl5.8 5.8.4-8 (using .../libperl5.8_5.8.7-9_amd64.deb) ...
 Unpacking replacement libperl5.8 ...
-Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.7-7_amd64.deb) ...
+Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.7-9_amd64.deb) ...
 Unpacking replacement perl-base ...
-Setting up perl-base (5.8.7-7) ...
+Setting up perl-base (5.8.7-9) ...
 (Reading database ... 11838 files and directories currently installed.)
 Preparing to replace liblocale-gettext-perl 1.01-17 (using .../liblocale-gettext-perl_1.05-1_amd64.deb) ...
 Unpacking replacement liblocale-gettext-perl ...
@@ -193,7 +195,7 @@ Preparing to replace debconf-i18n 1.4.30.13 (using .../debconf-i18n_1.4.59_all.d
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.4.30.13 (using .../debconf_1.4.59_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace adduser 3.63 (using .../archives/adduser_3.79_all.deb) ...
+Preparing to replace adduser 3.63 (using .../archives/adduser_3.80_all.deb) ...
 Unpacking replacement adduser ...
 Preparing to replace cron 3.0pl1-86 (using .../cron_3.0pl1-92_amd64.deb) ...
 Unpacking replacement cron ...
@@ -203,8 +205,8 @@ Preparing to replace ncurses-bin 5.4-4 (using .../ncurses-bin_5.5-1_amd64.deb) .
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.5-1) ...
 Selecting previously deselected package lsb-base.
-(Reading database ... 11867 files and directories currently installed.)
-Unpacking lsb-base (from .../lsb-base_3.0-11_all.deb) ...
+(Reading database ... 11880 files and directories currently installed.)
+Unpacking lsb-base (from .../lsb-base_3.0-12_all.deb) ...
 Preparing to replace netkit-inetd 0.10-10 (using .../netkit-inetd_0.10-10.2_amd64.deb) ...
 Unpacking replacement netkit-inetd ...
 Preparing to replace iputils-ping 3:20020927-2 (using .../iputils-ping_3%3a20020927-3_amd64.deb) ...
@@ -213,8 +215,6 @@ Preparing to replace netbase 4.21 (using .../archives/netbase_4.23_all.deb) ...
 Unpacking replacement netbase ...
 Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.60-1_amd64.deb) ...
 Unpacking replacement exim4-base ...
-Selecting previously deselected package libdb4.3.
-Unpacking libdb4.3 (from .../libdb4.3_4.3.28-2_amd64.deb) ...
 Preparing to replace libpam-modules 0.76-22 (using .../libpam-modules_0.79-3_amd64.deb) ...
 Unpacking replacement libpam-modules ...
 Setting up libdb4.3 (4.3.28-2) ...
@@ -223,7 +223,7 @@ Installing new version of config file /etc/security/access.conf ...
 Installing new version of config file /etc/security/pam_env.conf ...
 Installing new version of config file /etc/security/limits.conf ...
 
-(Reading database ... 11883 files and directories currently installed.)
+(Reading database ... 11892 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.13-7_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.13-7) ...
@@ -231,14 +231,14 @@ Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11892 files and directories currently installed.)
+(Reading database ... 11901 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.3-31sarge5 (using .../passwd_1%3a4.0.13-7_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-7) ...
 Installing new version of config file /etc/pam.d/chfn ...
 Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 11918 files and directories currently installed.)
+(Reading database ... 11927 files and directories currently installed.)
 Preparing to replace bash 2.05b-26 (using .../archives/bash_3.0-17_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.0-17) ...
@@ -247,17 +247,17 @@ Installing new version of config file /etc/skel/.bash_profile ...
 Installing new version of config file /etc/bash.bashrc ...
 Installing new version of config file /etc/bash_completion ...
 
-(Reading database ... 11922 files and directories currently installed.)
+(Reading database ... 11931 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12p-8) ...
 
-(Reading database ... 11922 files and directories currently installed.)
+(Reading database ... 11931 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2 (using .../coreutils_5.2.1-2.1_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (5.2.1-2.1) ...
 
-(Reading database ... 11921 files and directories currently installed.)
+(Reading database ... 11930 files and directories currently installed.)
 Preparing to replace dpkg 1.10.28 (using .../dpkg_1.13.11_amd64.deb) ...
 Unpacking replacement dpkg ...
 Setting up dpkg (1.13.11) ...
@@ -265,69 +265,69 @@ Installing new version of config file /etc/dpkg/origins/debian ...
 Adding `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Adding `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 
-(Reading database ... 11920 files and directories currently installed.)
+(Reading database ... 11929 files and directories currently installed.)
 Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38-2_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.38-2) ...
 
-(Reading database ... 11920 files and directories currently installed.)
+(Reading database ... 11929 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38-2_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.38-2) ...
-(Reading database ... 11924 files and directories currently installed.)
+(Reading database ... 11933 files and directories currently installed.)
 Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.25-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.25-1) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11944 files and directories currently installed.)
+(Reading database ... 11953 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds1-4 (using .../grep_2.5.1.ds2-4_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-4) ...
 
-(Reading database ... 11943 files and directories currently installed.)
+(Reading database ... 11952 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-10 (using .../gzip_1.3.5-12_amd64.deb) ...
 Unpacking replacement gzip ...
 Setting up gzip (1.3.5-12) ...
 
-(Reading database ... 11943 files and directories currently installed.)
+(Reading database ... 11952 files and directories currently installed.)
 Preparing to replace hostname 2.13 (using .../hostname_2.91_amd64.deb) ...
 Unpacking replacement hostname ...
 Setting up hostname (2.91) ...
-(Reading database ... 11943 files and directories currently installed.)
+(Reading database ... 11952 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12p-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12p-8) ...
 
 Selecting previously deselected package libsepol1.
-(Reading database ... 11943 files and directories currently installed.)
+(Reading database ... 11952 files and directories currently installed.)
 Unpacking libsepol1 (from .../libsepol1_1.8-1_amd64.deb) ...
 Setting up libsepol1 (1.8-1) ...
 
-(Reading database ... 11948 files and directories currently installed.)
+(Reading database ... 11957 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-4) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11948 files and directories currently installed.)
+(Reading database ... 11957 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-2_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
 Selecting previously deselected package libslang2.
-(Reading database ... 11952 files and directories currently installed.)
+(Reading database ... 11961 files and directories currently installed.)
 Unpacking libslang2 (from .../libslang2_2.0.5-1_amd64.deb) ...
 Setting up libslang2 (2.0.5-1) ...
 
-(Reading database ... 11964 files and directories currently installed.)
+(Reading database ... 11973 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12p-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11964 files and directories currently installed.)
+(Reading database ... 11973 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-4 (using .../ncurses-base_5.5-1_all.deb) ...
 Removing obsolete conffile /etc/terminfo/E/Eterm ...
 Removing obsolete conffile /etc/terminfo/E/Eterm-color ...
@@ -365,12 +365,12 @@ Removing obsolete conffile /etc/terminfo/x/xterm-vt220 ...
 Removing obsolete conffile /etc/terminfo/x/xterm-color ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.5-1) ...
-(Reading database ... 11968 files and directories currently installed.)
+(Reading database ... 11977 files and directories currently installed.)
 Preparing to replace console-data 2002.12.04dbs-49 (using .../console-data_2002.12.04dbs-50_all.deb) ...
 Unpacking replacement console-data ...
-Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-58_amd64.deb) ...
+Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-60_amd64.deb) ...
 Unpacking replacement console-tools ...
-Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-58_amd64.deb) ...
+Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-60_amd64.deb) ...
 Unpacking replacement libconsole ...
 Setting up liblocale-gettext-perl (1.05-1) ...
 Setting up libtext-iconv-perl (1.4-2) ...
@@ -379,17 +379,17 @@ Setting up libtext-wrapi18n-perl (0.06-4) ...
 Setting up debconf-i18n (1.4.59) ...
 Setting up debconf (1.4.59) ...
 
-(Reading database ... 11969 files and directories currently installed.)
+(Reading database ... 11978 files and directories currently installed.)
 Preparing to replace console-common 0.7.49 (using .../console-common_0.7.55_all.deb) ...
 Unpacking replacement console-common ...
 Preparing to replace dselect 1.10.28 (using .../dselect_1.13.11_amd64.deb) ...
 Unpacking replacement dselect ...
 Setting up dselect (1.13.11) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 11974 files and directories currently installed.)
+(Reading database ... 11983 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-4_amd64.deb) ...
 Unpacking replacement initscripts ...
-Setting up lsb-base (3.0-11) ...
+Setting up lsb-base (3.0-12) ...
 Setting up initscripts (2.86.ds1-4) ...
 Installing new version of config file /etc/init.d/bootclean.sh ...
 Installing new version of config file /etc/init.d/bootlogd ...
@@ -410,7 +410,7 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/urandom ...
 Installing new version of config file /etc/default/tmpfs ...
 
-(Reading database ... 11975 files and directories currently installed.)
+(Reading database ... 11984 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.25-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.32-1_amd64.deb) ...
@@ -419,51 +419,51 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.32-1) ...
 
-(Reading database ... 11975 files and directories currently installed.)
+(Reading database ... 11984 files and directories currently installed.)
 Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38-2_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38-2) ...
 
-(Reading database ... 11975 files and directories currently installed.)
+(Reading database ... 11984 files and directories currently installed.)
 Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38-2_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38-2) ...
 
-(Reading database ... 11975 files and directories currently installed.)
+(Reading database ... 11984 files and directories currently installed.)
 Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38-2_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38-2) ...
 
-(Reading database ... 11975 files and directories currently installed.)
+(Reading database ... 11984 files and directories currently installed.)
 Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38-2_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38-2) ...
 
-(Reading database ... 11975 files and directories currently installed.)
+(Reading database ... 11984 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-4_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-4) ...
 
-(Reading database ... 11975 files and directories currently installed.)
+(Reading database ... 11984 files and directories currently installed.)
 Preparing to replace binutils 2.15-6 (using .../binutils_2.16.1cvs20051117-1_amd64.deb) ...
 Unpacking replacement binutils ...
-Preparing to replace libstdc++5-3.3-dev 1:3.3.5-13 (using .../libstdc++5-3.3-dev_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace libstdc++5-3.3-dev 1:3.3.5-13 (using .../libstdc++5-3.3-dev_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement libstdc++5-3.3-dev ...
-Preparing to replace g++-3.3 1:3.3.5-13 (using .../g++-3.3_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace g++-3.3 1:3.3.5-13 (using .../g++-3.3_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement g++-3.3 ...
-Preparing to replace gcc-3.3 1:3.3.5-13 (using .../gcc-3.3_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace gcc-3.3 1:3.3.5-13 (using .../gcc-3.3_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3 ...
-Preparing to replace cpp-3.3 1:3.3.5-13 (using .../cpp-3.3_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace cpp-3.3 1:3.3.5-13 (using .../cpp-3.3_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement cpp-3.3 ...
-Preparing to replace gcc-3.3-base 1:3.3.5-13 (using .../gcc-3.3-base_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace gcc-3.3-base 1:3.3.5-13 (using .../gcc-3.3-base_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3-base ...
-Preparing to replace libstdc++5 1:3.3.5-13 (using .../libstdc++5_1%3a3.3.6-7_amd64.deb) ...
+Preparing to replace libstdc++5 1:3.3.5-13 (using .../libstdc++5_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement libstdc++5 ...
-Setting up gcc-3.3-base (3.3.6-7) ...
-Setting up libstdc++5 (3.3.6-7) ...
+Setting up gcc-3.3-base (3.3.6-10) ...
+Setting up libstdc++5 (3.3.6-10) ...
 
 Selecting previously deselected package dmidecode.
-(Reading database ... 11993 files and directories currently installed.)
+(Reading database ... 12002 files and directories currently installed.)
 Unpacking dmidecode (from .../dmidecode_2.7-2_amd64.deb) ...
 Selecting previously deselected package laptop-detect.
 Unpacking laptop-detect (from .../laptop-detect_0.12.1_amd64.deb) ...
@@ -499,7 +499,7 @@ Preparing to replace modutils 2.4.26-1.2 (using .../modutils_2.4.27.0-3_amd64.de
 Unpacking replacement modutils ...
 Preparing to replace nano 1.2.4-5 (using .../nano_1.3.8-2_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace net-tools 1.60-10 (using .../net-tools_1.60-16_amd64.deb) ...
+Preparing to replace net-tools 1.60-10 (using .../net-tools_1.60-17_amd64.deb) ...
 Unpacking replacement net-tools ...
 Preparing to replace wget 1.9.1-12 (using .../wget_1.10.2-1_amd64.deb) ...
 Unpacking replacement wget ...
@@ -515,7 +515,7 @@ Preparing to replace at 3.1.8-11 (using .../archives/at_3.1.9_amd64.deb) ...
 Stopping deferred execution scheduler: atd.
 Unpacking replacement at ...
 Selecting previously deselected package cpp-4.0.
-Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-2_amd64.deb) ...
+Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-5_amd64.deb) ...
 Preparing to replace cpp 4:3.3.5-3 (using .../cpp_4%3a4.0.2-1_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace make 3.80-9 (using .../make_3.80-11_amd64.deb) ...
@@ -525,14 +525,14 @@ Unpacking replacement dpkg-dev ...
 Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.60-1_all.deb) ...
 Unpacking replacement exim4 ...
 Selecting previously deselected package gcc-4.0.
-Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-2_amd64.deb) ...
+Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-5_amd64.deb) ...
 Preparing to replace gcc 4:3.3.5-3 (using .../gcc_4%3a4.0.2-1_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
 Selecting previously deselected package libstdc++6-4.0-dev.
-Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-2_amd64.deb) ...
+Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.2-5_amd64.deb) ...
 Selecting previously deselected package g++-4.0.
-Unpacking g++-4.0 (from .../g++-4.0_4.0.2-2_amd64.deb) ...
+Unpacking g++-4.0 (from .../g++-4.0_4.0.2-5_amd64.deb) ...
 Preparing to replace g++ 4:3.3.5-3 (using .../g++_4%3a4.0.2-1_amd64.deb) ...
 Unpacking replacement g++ ...
 Preparing to replace libtextwrap1 0.1-1 (using .../libtextwrap1_0.1-3_amd64.deb) ...
@@ -577,9 +577,9 @@ Setting up liblzo1 (1.08-2) ...
 
 Setting up libgnutls12 (1.2.9-2) ...
 
-Setting up libpcre3 (6.4-1) ...
+Setting up libpcre3 (6.4-1.1) ...
 
-Setting up adduser (3.79) ...
+Setting up adduser (3.80) ...
 
 Setting up cron (3.0pl1-92) ...
 Installing new version of config file /etc/init.d/cron ...
@@ -613,14 +613,14 @@ Installing new version of config file /etc/cron.daily/exim4-base ...
 
 Setting up exim4-daemon-light (4.60-1) ...
 
-Setting up libperl5.8 (5.8.7-7) ...
+Setting up libperl5.8 (5.8.7-9) ...
 
-Setting up libconsole (0.2.3dbs-58) ...
+Setting up libconsole (0.2.3dbs-60) ...
 
 Setting up binutils (2.16.1cvs20051117-1) ...
 
-Setting up cpp-3.3 (3.3.6-7) ...
-Setting up gcc-3.3 (3.3.6-7) ...
+Setting up cpp-3.3 (3.3.6-10) ...
+Setting up gcc-3.3 (3.3.6-10) ...
 Setting up dmidecode (2.7-2) ...
 Setting up laptop-detect (0.12.1) ...
 Setting up tasksel (2.33) ...
@@ -657,7 +657,7 @@ Architecture-specific modutils configuration for x86_64 not found, using default
 Setting up nano (1.3.8-2) ...
 Installing new version of config file /etc/nanorc ...
 
-Setting up net-tools (1.60-16) ...
+Setting up net-tools (1.60-17) ...
 Setting up wget (1.10.2-1) ...
 Installing new version of config file /etc/wgetrc ...
 
@@ -674,12 +674,12 @@ Installing new version of config file /etc/init.d/procps.sh ...
 Setting up at (3.1.9) ...
 Installing new version of config file /etc/init.d/atd ...
 
-Setting up cpp-4.0 (4.0.2-2) ...
+Setting up cpp-4.0 (4.0.2-5) ...
 Setting up cpp (4.0.2-1) ...
 Setting up make (3.80-11) ...
 
 Setting up exim4 (4.60-1) ...
-Setting up gcc-4.0 (4.0.2-2) ...
+Setting up gcc-4.0 (4.0.2-5) ...
 Setting up gcc (4.0.2-1) ...
 
 Setting up libtextwrap1 (0.1-3) ...
@@ -706,10 +706,10 @@ Setting up console-data (2002.12.04dbs-50) ...
 Looking for keymap to install:
 NONE
 
-Setting up libstdc++5-3.3-dev (3.3.6-7) ...
-Setting up libstdc++6-4.0-dev (4.0.2-2) ...
-Setting up perl-modules (5.8.7-7) ...
-Setting up console-tools (0.2.3dbs-58) ...
+Setting up libstdc++5-3.3-dev (3.3.6-10) ...
+Setting up libstdc++6-4.0-dev (4.0.2-5) ...
+Setting up perl-modules (5.8.7-9) ...
+Setting up console-tools (0.2.3dbs-60) ...
 Installing new version of config file /etc/init.d/console-screen.sh ...
 
 Setting up console-common (0.7.55) ...
@@ -717,13 +717,13 @@ Installing new version of config file /etc/init.d/keymap.sh ...
 Looking for keymap to install:
 NONE
 
-Setting up g++-3.3 (3.3.6-7) ...
+Setting up g++-3.3 (3.3.6-10) ...
 Setting up base-config (2.73) ...
 
-Setting up g++-4.0 (4.0.2-2) ...
+Setting up g++-4.0 (4.0.2-5) ...
 Setting up g++ (4.0.2-1) ...
 
-Setting up perl (5.8.7-7) ...
+Setting up perl (5.8.7-9) ...
 
 Setting up dpkg-dev (1.13.11) ...
 Installing new version of config file /etc/dpkg/shlibs.default ...
@@ -738,6 +738,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//18789 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//11759 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 070e657..2f713f9 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/22019/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/10429/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.9 2005/12/05 12:15:08 dancer Exp $
@@ -24,7 +24,7 @@ The following NEW packages will be installed:
 Need to get 0B/133kB of archives.
 After unpacking 737kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11850 files and directories currently installed.)
+(Reading database ... 11881 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.35_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.35_amd64.deb) ...
@@ -59,7 +59,7 @@ The following NEW packages will be installed:
 Need to get 0B/2892kB of archives.
 After unpacking 9572kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11943 files and directories currently installed.)
+(Reading database ... 11974 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -103,7 +103,7 @@ The following NEW packages will be installed:
 Need to get 0B/94.3kB of archives.
 After unpacking 360kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12534 files and directories currently installed.)
+(Reading database ... 12565 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
@@ -116,14 +116,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -312,18 +312,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -336,26 +336,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -367,7 +367,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -391,10 +390,10 @@ success
 success
 success
 success
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -406,7 +405,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 03:28:27 UTC 2005
+Wed Dec 14 03:15:55 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -476,14 +475,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 10 03:28:32 UTC 2005
+Wed Dec 14 03:16:00 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -492,9 +491,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -504,58 +503,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -593,6 +592,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/22019 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/10429 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sarge.log b/testsuite/normal/pdebuild-internal-sarge.log
index 347a07c..d8b52c5 100644
--- a/testsuite/normal/pdebuild-internal-sarge.log
+++ b/testsuite/normal/pdebuild-internal-sarge.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/10327/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/4609/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.9 2005/12/05 12:15:08 dancer Exp $
@@ -110,14 +110,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -305,18 +305,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -329,26 +329,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -399,7 +399,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 03:15:07 UTC 2005
+Wed Dec 14 03:08:38 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -469,14 +469,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 10 03:15:12 UTC 2005
+Wed Dec 14 03:08:43 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
+dsh: Process terminated (before write).
 b: b
 c: c
-dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -485,9 +485,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -495,58 +495,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
   for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
     /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -570,6 +570,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/10327 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/4609 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index bbc6cb6..22f5401 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/7193/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/5430/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.9 2005/12/05 12:15:08 dancer Exp $
@@ -24,7 +24,7 @@ The following NEW packages will be installed:
 Need to get 0B/134kB of archives.
 After unpacking 745kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11886 files and directories currently installed.)
+(Reading database ... 11895 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.36_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.36_amd64.deb) ...
@@ -59,7 +59,7 @@ The following NEW packages will be installed:
 Need to get 0B/2915kB of archives.
 After unpacking 9609kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11980 files and directories currently installed.)
+(Reading database ... 11989 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -74,7 +74,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.1_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.9_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.10_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -90,7 +90,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.1) ...
-Setting up debhelper (5.0.9) ...
+Setting up debhelper (5.0.10) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -103,7 +103,7 @@ The following NEW packages will be installed:
 Need to get 0B/94.3kB of archives.
 After unpacking 360kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12576 files and directories currently installed.)
+(Reading database ... 12585 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
@@ -116,14 +116,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -136,7 +136,7 @@ dpkg-source: building dsh in dsh_0.25.6-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
- ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
+	 ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
 checking for gawk... no
@@ -312,50 +312,50 @@ 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.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
-then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
+	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; \
-then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.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-parameter.o -MD -MP -MF ".deps/dsh-parameter.Tpo" -c -o dsh-parameter.o `test -f 'parameter.c' || echo './'`parameter.c; \
-then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
 gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
 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.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -406,7 +406,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 03:06:58 UTC 2005
+Wed Dec 14 03:04:25 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -476,13 +476,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 10 03:07:03 UTC 2005
+Wed Dec 14 03:04:30 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-c: c
 dsh: Process terminated (before write).
+c: c
 b: b
 PASS: tests/segv-catcher.sh
 l w
@@ -492,9 +492,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -504,58 +504,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
-  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
-    /usr/bin/install -c -m 644 ./$file \
-		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
-  done; \
-else \
-  : ; \
-fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
+	    /usr/bin/install -c -m 644 ./$file \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
-	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
-	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
-done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+	done
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -593,6 +593,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/7193 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/5430 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index f5de978..0c99e03 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 10 12:25:52 JST 2005
-pbuilder-time-stamp: 1134185152
+Current time: Wed Dec 14 12:14:39 JST 2005
+pbuilder-time-stamp: 1134530079
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/14275/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/3546/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -66,7 +66,7 @@ The following NEW packages will be installed:
 Need to get 0B/2892kB of archives.
 After unpacking 9572kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11850 files and directories currently installed.)
+(Reading database ... 11881 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -110,13 +110,13 @@ The following NEW packages will be installed:
 Need to get 0B/94.3kB of archives.
 After unpacking 360kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12441 files and directories currently installed.)
+(Reading database ... 12472 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/14275/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/14275/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/3546/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/3546/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -431,8 +431,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
@@ -444,7 +444,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 03:27:03 UTC 2005
+Wed Dec 14 03:15:12 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -514,14 +514,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 10 03:27:08 UTC 2005
+Wed Dec 14 03:15:17 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
-c: c
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -643,7 +643,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Dec 10 12:27:11 JST 2005
-pbuilder-time-stamp: 1134185231
+Current time: Wed Dec 14 12:15:19 JST 2005
+pbuilder-time-stamp: 1134530119
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/14275 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/3546 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index 1c185cf..c7a22a7 100644
--- a/testsuite/normal/pdebuild-normal-sarge.log
+++ b/testsuite/normal/pdebuild-normal-sarge.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 10 12:12:42 JST 2005
-pbuilder-time-stamp: 1134184362
+Current time: Wed Dec 14 12:07:32 JST 2005
+pbuilder-time-stamp: 1134529652
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/2471/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/30191/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -115,8 +115,8 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/2471/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/2471/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/30191/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/30191/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -427,8 +427,8 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -441,7 +441,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 03:13:48 UTC 2005
+Wed Dec 14 03:08:02 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -511,7 +511,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 10 03:13:53 UTC 2005
+Wed Dec 14 03:08:07 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -624,7 +624,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Dec 10 12:13:55 JST 2005
-pbuilder-time-stamp: 1134184435
+Current time: Wed Dec 14 12:08:09 JST 2005
+pbuilder-time-stamp: 1134529689
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/2471 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/30191 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index b5cc2d4..e780f62 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Dec 10 12:04:20 JST 2005
-pbuilder-time-stamp: 1134183860
+Current time: Wed Dec 14 12:03:07 JST 2005
+pbuilder-time-stamp: 1134529387
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31788/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/31008/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -66,7 +66,7 @@ The following NEW packages will be installed:
 Need to get 0B/2915kB of archives.
 After unpacking 9609kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11886 files and directories currently installed.)
+(Reading database ... 11895 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -81,7 +81,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.9.1_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.9_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.10_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -97,7 +97,7 @@ Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
 Setting up po-debconf (0.9.1) ...
-Setting up debhelper (5.0.9) ...
+Setting up debhelper (5.0.10) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
@@ -110,13 +110,13 @@ The following NEW packages will be installed:
 Need to get 0B/94.3kB of archives.
 After unpacking 360kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 12482 files and directories currently installed.)
+(Reading database ... 12491 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.5_amd64.deb) ...
 Setting up fakeroot (1.5.5) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31788/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31788/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/31008/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/31008/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -174,7 +174,7 @@ dpkg-source: building dsh in dsh_0.25.6-1.dsc
  debian/rules build
 dh_testdir
 INSTALL_PROGRAM='install -p    -o root -g root  -m  755 -s' CFLAGS='-Wall -g -O2' \
- ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
+	 ./configure --prefix=/usr --sysconfdir=/etc/dsh --mandir=/usr/share/man
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
 checking for gawk... no
@@ -363,11 +363,11 @@ make[3]: Nothing to be done for `all'.
 make[3]: Leaving directory `/tmp/buildd/dsh-0.25.6/po'
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.6'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
-then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
+	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; \
-then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-linkedlist.Tpo" ".deps/dsh-linkedlist.Po"; else rm -f ".deps/dsh-linkedlist.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-parameter.o -MD -MP -MF ".deps/dsh-parameter.Tpo" -c -o dsh-parameter.o `test -f 'parameter.c' || echo './'`parameter.c; \
-then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
+	then mv -f ".deps/dsh-parameter.Tpo" ".deps/dsh-parameter.Po"; else rm -f ".deps/dsh-parameter.Tpo"; exit 1; fi
 /bin/sh ./libtool --mode=link gcc  -Wall -g -O2   -o dsh  dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  -ldshconfig 
 mkdir .libs
 gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/libdshconfig.so
@@ -429,10 +429,10 @@ success
 success
 success
 success
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -444,7 +444,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 10 03:05:30 UTC 2005
+Wed Dec 14 03:03:43 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -514,14 +514,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 10 03:05:35 UTC 2005
+Wed Dec 14 03:03:48 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
-c: c
 b: b
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -558,14 +557,14 @@ mkdir -p -- /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share
 mkdir -p -- /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
 installing ja.gmo as /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
-  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
-    /usr/bin/install -c -m 644 ./$file \
-		    /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
-  done; \
-else \
-  : ; \
-fi
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
+	    /usr/bin/install -c -m 644 ./$file \
+			    /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
 make[2]: Leaving directory `/tmp/buildd/dsh-0.25.6/po'
 make[2]: Entering directory `/tmp/buildd/dsh-0.25.6'
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.6'
@@ -575,13 +574,13 @@ install -p -o root -g root -m 755 -s dsh /tmp/buildd/dsh-0.25.6/debian/dsh/usr/b
 test -z "/etc/dsh" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/etc/dsh"
  /usr/bin/install -c -m 644 'dsh.conf' '/tmp/buildd/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
-	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
-	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
-done
+		mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
+			> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
+			> /tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+	done
 test -z "/usr/share/man/man1" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man1"
  /usr/bin/install -c -m 644 './build-man/dsh.1' '/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
 test -z "/usr/share/man/man5" || mkdir -p -- . "/tmp/buildd/dsh-0.25.6/debian/dsh/usr/share/man/man5"
@@ -643,7 +642,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Dec 10 12:05:37 JST 2005
-pbuilder-time-stamp: 1134183937
+Current time: Wed Dec 14 12:03:50 JST 2005
+pbuilder-time-stamp: 1134529430
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.w6uwRC/dir3/31788 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.O4g2U4/dir3/31008 and its subdirectories