really add bash_completion

14 files changed, 218 insertions, 129 deletions

diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 76e902c..357b664 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -415,7 +415,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -439,10 +438,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
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-a: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -454,7 +453,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Oct 19 03:08:57 UTC 2007
+Mon Oct 22 03:08:25 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -524,7 +523,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
-Fri Oct 19 03:09:02 UTC 2007
+Mon Oct 22 03:08:30 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pbuilder-build-dsh-lenny.log b/testsuite/normal/pbuilder-build-dsh-lenny.log
index a16834d..7266df3 100644
--- a/testsuite/normal/pbuilder-build-dsh-lenny.log
+++ b/testsuite/normal/pbuilder-build-dsh-lenny.log
@@ -444,9 +444,9 @@ success
 success
 success
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-a: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+c: 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
@@ -458,7 +458,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Oct 19 03:18:37 UTC 2007
+Mon Oct 22 03:17:25 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -528,7 +528,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
-Fri Oct 19 03:18:42 UTC 2007
+Mon Oct 22 03:17:30 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index f6b3104..aa596b5 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -67,7 +67,7 @@ Get:4 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-2 [133kB]
 Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-2 [2269kB]
 Get:6 http://cdn.debian.or.jp sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.9 [117kB]
-Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.57 [519kB]
+Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.58 [519kB]
 Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.13-1 [11.0kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.13-1 [25.4kB]
 Get:11 http://cdn.debian.or.jp sid/main libsgmls-perl 1.03ii-31 [29.3kB]
@@ -91,7 +91,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) .
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_1.0.9_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.57_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.58_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -111,7 +111,7 @@ Setting up gettext-base (0.16.1-2) ...
 Setting up gettext (0.16.1-2) ...
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.9) ...
-Setting up debhelper (5.0.57) ...
+Setting up debhelper (5.0.58) ...
 Setting up libdshconfig1 (0.20.13-1) ...
 Setting up libdshconfig1-dev (0.20.13-1) ...
 Setting up libsgmls-perl (1.03ii-31) ...
@@ -443,10 +443,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
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: 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
@@ -458,7 +458,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Oct 19 03:03:45 UTC 2007
+Mon Oct 22 03:03:15 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -528,7 +528,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
-Fri Oct 19 03:03:50 UTC 2007
+Mon Oct 22 03:03:20 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pbuilder-update-etch-etch.log b/testsuite/normal/pbuilder-update-etch-etch.log
index 958a6dd..91fcb08 100644
--- a/testsuite/normal/pbuilder-update-etch-etch.log
+++ b/testsuite/normal/pbuilder-update-etch-etch.log
@@ -11,7 +11,7 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp lenny Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp lenny Release [68.5kB]
-Get:3 http://cdn.debian.or.jp lenny/main Packages [6176kB]
+Get:3 http://cdn.debian.or.jp lenny/main Packages [6186kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
diff --git a/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
index 873924c..0805ae4 100644
--- a/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
@@ -15,7 +15,7 @@ Get:2 http://cdn.debian.or.jp experimental Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:3 http://cdn.debian.or.jp experimental Release [79.6kB]
 Get:4 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Get:5 http://cdn.debian.or.jp experimental/main Packages [251kB]
+Get:5 http://cdn.debian.or.jp experimental/main Packages [258kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 87edfb9..6432a1f 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -11,23 +11,24 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6488kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6510kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
-  coreutils cpp-4.2 debianutils g++-4.2 gcc-4.2 gcc-4.2-base gzip
-  laptop-detect libc6 libc6-dev libdb4.6 libgcc1 libgomp1 libncurses5
-  libncursesw5 libsasl2-2 libslang2 libssl0.9.8 libstdc++6 libstdc++6-4.2-dev
-  man-db ncurses-base ncurses-bin net-tools perl perl-base perl-modules tzdata
-  vim-common vim-tiny
-30 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 31.2MB of archives.
-After unpacking 1913kB disk space will be freed.
+  bsdutils coreutils cpp-4.1 cpp-4.2 debconf debconf-i18n debianutils g++-4.1
+  g++-4.2 gcc-4.1 gcc-4.1-base gcc-4.2 gcc-4.2-base gzip laptop-detect libc6
+  libc6-dev libdb4.6 libgcc1 libgomp1 libncurses5 libncursesw5 libsasl2-2
+  libslang2 libssl0.9.8 libstdc++6 libstdc++6-4.1-dev libstdc++6-4.2-dev
+  man-db mount ncurses-base ncurses-bin net-tools perl perl-base perl-modules
+  tasksel tasksel-data tzdata util-linux vim-common vim-tiny
+42 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 39.8MB of archives.
+After unpacking 1855kB disk space will be freed.
 Get:1 http://cdn.debian.or.jp sid/main coreutils 5.97-5.4 [3213kB]
-Get:2 http://cdn.debian.or.jp sid/main debianutils 2.25.2 [54.3kB]
+Get:2 http://cdn.debian.or.jp sid/main debianutils 2.26 [54.5kB]
 Get:3 http://cdn.debian.or.jp sid/main gzip 1.3.12-3.2 [106kB]
 Get:4 http://cdn.debian.or.jp sid/main libc6-dev 2.6.1-6 [2489kB]
 Get:5 http://cdn.debian.or.jp sid/main libgomp1 4.2.2-3 [13.4kB]
@@ -45,17 +46,30 @@ Get:16 http://cdn.debian.or.jp sid/main perl-modules 5.8.8-11.1 [2300kB]
 Get:17 http://cdn.debian.or.jp sid/main libdb4.6 4.6.21-3 [581kB]
 Get:18 http://cdn.debian.or.jp sid/main perl 5.8.8-11.1 [4052kB]
 Get:19 http://cdn.debian.or.jp sid/main perl-base 5.8.8-11.1 [837kB]
-Get:20 http://cdn.debian.or.jp sid/main ncurses-base 5.6+20071013-1 [13.2kB]
-Get:21 http://cdn.debian.or.jp sid/main libslang2 2.0.7-5 [459kB]
+Get:20 http://cdn.debian.or.jp sid/main debconf-i18n 1.5.15 [163kB]
+Get:21 http://cdn.debian.or.jp sid/main debconf 1.5.15 [151kB]
 Get:22 http://cdn.debian.or.jp sid/main tzdata 2007h-2 [724kB]
-Get:23 http://cdn.debian.or.jp sid/main laptop-detect 0.13.2 [4764B]
-Get:24 http://cdn.debian.or.jp sid/main libncursesw5 5.6+20071013-1 [361kB]
-Get:25 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-15 [108kB]
-Get:26 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8f-1 [944kB]
-Get:27 http://cdn.debian.or.jp sid/main man-db 2.5.0-3 [840kB]
-Get:28 http://cdn.debian.or.jp sid/main net-tools 1.60-17.1 [278kB]
-Get:29 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-138+1 [372kB]
-Get:30 http://cdn.debian.or.jp sid/main vim-common 1:7.1-138+1 [185kB]
+Get:23 http://cdn.debian.or.jp sid/main util-linux 2.13-9 [455kB]
+Get:24 http://cdn.debian.or.jp sid/main bsdutils 1:2.13-9 [94.2kB]
+Get:25 http://cdn.debian.or.jp sid/main mount 2.13-9 [134kB]
+Get:26 http://cdn.debian.or.jp sid/main ncurses-base 5.6+20071013-1 [13.2kB]
+Get:27 http://cdn.debian.or.jp sid/main libslang2 2.0.7-5 [459kB]
+Get:28 http://cdn.debian.or.jp sid/main laptop-detect 0.13.2 [4764B]
+Get:29 http://cdn.debian.or.jp sid/main libncursesw5 5.6+20071013-1 [361kB]
+Get:30 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-16 [108kB]
+Get:31 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8g-1 [944kB]
+Get:32 http://cdn.debian.or.jp sid/main man-db 2.5.0-3 [840kB]
+Get:33 http://cdn.debian.or.jp sid/main net-tools 1.60-17.1 [278kB]
+Get:34 http://cdn.debian.or.jp sid/main tasksel-data 2.69 [365kB]
+Get:35 http://cdn.debian.or.jp sid/main tasksel 2.69 [77.9kB]
+Get:36 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-138+1 [372kB]
+Get:37 http://cdn.debian.or.jp sid/main vim-common 1:7.1-138+1 [185kB]
+Get:38 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-17 [1154kB]
+Get:39 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-17 [2836kB]
+Get:40 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-17 [432kB]
+Get:41 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-17 [2529kB]
+Get:42 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-17 [206kB]
+
Extracting templates from packages: 71%
Extracting templates from packages: 100%
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
 (Reading database ... 11969 files and directories currently installed.)
@@ -63,9 +77,9 @@ Preparing to replace coreutils 5.97-5.3 (using .../coreutils_5.97-5.4_amd64.deb)
 Unpacking replacement coreutils ...
 Setting up coreutils (5.97-5.4) ...
 (Reading database ... 11969 files and directories currently installed.)
-Preparing to replace debianutils 2.25.1 (using .../debianutils_2.25.2_amd64.deb) ...
+Preparing to replace debianutils 2.25.1 (using .../debianutils_2.26_amd64.deb) ...
 Unpacking replacement debianutils ...
-Setting up debianutils (2.25.2) ...
+Setting up debianutils (2.26) ...
 (Reading database ... 11969 files and directories currently installed.)
 Preparing to replace gzip 1.3.12-3.1 (using .../gzip_1.3.12-3.2_amd64.deb) ...
 Unpacking replacement gzip ...
@@ -117,16 +131,15 @@ Preparing to replace perl-base 5.8.8-7 (using .../perl-base_5.8.8-11.1_amd64.deb
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-11.1) ...
 (Reading database ... 11593 files and directories currently installed.)
-Preparing to replace ncurses-base 5.6+20070908-1 (using .../ncurses-base_5.6+20071013-1_all.deb) ...
-Unpacking replacement ncurses-base ...
-Setting up ncurses-base (5.6+20071013-1) ...
-(Reading database ... 11593 files and directories currently installed.)
-Preparing to replace libslang2 2.0.7-3 (using .../libslang2_2.0.7-5_amd64.deb) ...
-Unpacking replacement libslang2 ...
-Setting up libslang2 (2.0.7-5) ...
-(Reading database ... 11593 files and directories currently installed.)
+Preparing to replace debconf-i18n 1.5.14 (using .../debconf-i18n_1.5.15_all.deb) ...
+Unpacking replacement debconf-i18n ...
+Preparing to replace debconf 1.5.14 (using .../debconf_1.5.15_all.deb) ...
+Unpacking replacement debconf ...
 Preparing to replace tzdata 2007h-1 (using .../tzdata_2007h-2_all.deb) ...
 Unpacking replacement tzdata ...
+Setting up debconf-i18n (1.5.15) ...
+Setting up debconf (1.5.15) ...
+Installing new version of config file /etc/debconf.conf ...
 Setting up tzdata (2007h-2) ...
 
 User defined timezone, leaving /etc/localtime unchanged.
@@ -134,23 +147,57 @@ Local time is now: XXXX
 Universal Time is now: XXXX
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
+(Reading database ... 11594 files and directories currently installed.)
+Preparing to replace util-linux 2.13-8 (using .../util-linux_2.13-9_amd64.deb) ...
+Unpacking replacement util-linux ...
+Setting up util-linux (2.13-9) ...
+(Reading database ... 11593 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.13-8 (using .../bsdutils_1%3a2.13-9_amd64.deb) ...
+Unpacking replacement bsdutils ...
+Setting up bsdutils (1:2.13-9) ...
+(Reading database ... 11593 files and directories currently installed.)
+Preparing to replace mount 2.13-8 (using .../mount_2.13-9_amd64.deb) ...
+Unpacking replacement mount ...
+Setting up mount (2.13-9) ...
+(Reading database ... 11593 files and directories currently installed.)
+Preparing to replace ncurses-base 5.6+20070908-1 (using .../ncurses-base_5.6+20071013-1_all.deb) ...
+Unpacking replacement ncurses-base ...
+Setting up ncurses-base (5.6+20071013-1) ...
+(Reading database ... 11593 files and directories currently installed.)
+Preparing to replace libslang2 2.0.7-3 (using .../libslang2_2.0.7-5_amd64.deb) ...
+Unpacking replacement libslang2 ...
+Setting up libslang2 (2.0.7-5) ...
 (Reading database ... 11593 files and directories currently installed.)
 Preparing to replace laptop-detect 0.12.1-0.1 (using .../laptop-detect_0.13.2_amd64.deb) ...
 Unpacking replacement laptop-detect ...
 Preparing to replace libncursesw5 5.6+20070908-1 (using .../libncursesw5_5.6+20071013-1_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
-Preparing to replace libsasl2-2 2.1.22.dfsg1-14 (using .../libsasl2-2_2.1.22.dfsg1-15_amd64.deb) ...
+Preparing to replace libsasl2-2 2.1.22.dfsg1-14 (using .../libsasl2-2_2.1.22.dfsg1-16_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
-Preparing to replace libssl0.9.8 0.9.8e-9 (using .../libssl0.9.8_0.9.8f-1_amd64.deb) ...
+Preparing to replace libssl0.9.8 0.9.8e-9 (using .../libssl0.9.8_0.9.8g-1_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
 Preparing to replace man-db 2.4.4-4 (using .../man-db_2.5.0-3_amd64.deb) ...
 Unpacking replacement man-db ...
 Preparing to replace net-tools 1.60-17 (using .../net-tools_1.60-17.1_amd64.deb) ...
 Unpacking replacement net-tools ...
+Preparing to replace tasksel-data 2.68 (using .../tasksel-data_2.69_all.deb) ...
+Unpacking replacement tasksel-data ...
+Preparing to replace tasksel 2.68 (using .../archives/tasksel_2.69_all.deb) ...
+Unpacking replacement tasksel ...
 Preparing to replace vim-tiny 1:7.1-056+2 (using .../vim-tiny_1%3a7.1-138+1_amd64.deb) ...
 Unpacking replacement vim-tiny ...
 Preparing to replace vim-common 1:7.1-056+2 (using .../vim-common_1%3a7.1-138+1_amd64.deb) ...
 Unpacking replacement vim-common ...
+Preparing to replace libstdc++6-4.1-dev 4.1.2-16 (using .../libstdc++6-4.1-dev_4.1.2-17_amd64.deb) ...
+Unpacking replacement libstdc++6-4.1-dev ...
+Preparing to replace g++-4.1 4.1.2-16 (using .../g++-4.1_4.1.2-17_amd64.deb) ...
+Unpacking replacement g++-4.1 ...
+Preparing to replace gcc-4.1 4.1.2-16 (using .../gcc-4.1_4.1.2-17_amd64.deb) ...
+Unpacking replacement gcc-4.1 ...
+Preparing to replace cpp-4.1 4.1.2-16 (using .../cpp-4.1_4.1.2-17_amd64.deb) ...
+Unpacking replacement cpp-4.1 ...
+Preparing to replace gcc-4.1-base 4.1.2-16 (using .../gcc-4.1-base_4.1.2-17_amd64.deb) ...
+Unpacking replacement gcc-4.1-base ...
 Setting up libc6-dev (2.6.1-6) ...
 Setting up libgomp1 (4.2.2-3) ...
 Setting up cpp-4.2 (4.2.2-3) ...
@@ -158,17 +205,24 @@ Setting up gcc-4.2 (4.2.2-3) ...
 Setting up libdb4.6 (4.6.21-3) ...
 Setting up laptop-detect (0.13.2) ...
 Setting up libncursesw5 (5.6+20071013-1) ...
-Setting up libsasl2-2 (2.1.22.dfsg1-15) ...
-Setting up libssl0.9.8 (0.9.8f-1) ...
+Setting up libsasl2-2 (2.1.22.dfsg1-16) ...
+Setting up libssl0.9.8 (0.9.8g-1) ...
 Setting up man-db (2.5.0-3) ...
 Installing new version of config file /etc/manpath.config ...
 Setting up net-tools (1.60-17.1) ...
 Setting up vim-common (1:7.1-138+1) ...
 Setting up vim-tiny (1:7.1-138+1) ...
-Setting up g++-4.2 (4.2.2-3) ...
+Setting up gcc-4.1-base (4.1.2-17) ...
+Setting up cpp-4.1 (4.1.2-17) ...
+Setting up gcc-4.1 (4.1.2-17) ...
 Setting up perl-modules (5.8.8-11.1) ...
-Setting up libstdc++6-4.2-dev (4.2.2-3) ...
+Setting up tasksel-data (2.69) ...
+Setting up libstdc++6-4.1-dev (4.1.2-17) ...
+Setting up g++-4.2 (4.2.2-3) ...
 Setting up perl (5.8.8-11.1) ...
+Setting up tasksel (2.69) ...
+Setting up g++-4.1 (4.1.2-17) ...
+Setting up libstdc++6-4.2-dev (4.2.2-3) ...
 Reading package lists...
 Building dependency tree...
 Reading state information...
diff --git a/testsuite/normal/pbuilder-update-lenny-sid-experimental.log b/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
index 7835525..36dd81e 100644
--- a/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
@@ -15,7 +15,7 @@ Get:2 http://cdn.debian.or.jp experimental Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:3 http://cdn.debian.or.jp experimental Release [79.6kB]
 Get:4 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Get:5 http://cdn.debian.or.jp experimental/main Packages [251kB]
+Get:5 http://cdn.debian.or.jp experimental/main Packages [258kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
diff --git a/testsuite/normal/pbuilder-update-lenny-sid.log b/testsuite/normal/pbuilder-update-lenny-sid.log
index 1d64fc9..3e1ecdc 100644
--- a/testsuite/normal/pbuilder-update-lenny-sid.log
+++ b/testsuite/normal/pbuilder-update-lenny-sid.log
@@ -11,7 +11,7 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6488kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6510kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -19,16 +19,17 @@ Reading package lists...
 Building dependency tree...
 Reading state information...
 The following packages will be upgraded:
-  coreutils cpp-4.2 debianutils g++-4.2 gcc-4.2 gcc-4.2-base gzip
-  laptop-detect libc6 libc6-dev libdb4.6 libgcc1 libgomp1 libncurses5
-  libncursesw5 libsasl2-2 libslang2 libssl0.9.8 libstdc++6 libstdc++6-4.2-dev
-  man-db ncurses-base ncurses-bin net-tools perl perl-base perl-modules tzdata
-  vim-common vim-tiny
-30 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 31.2MB of archives.
-After unpacking 1913kB disk space will be freed.
+  bsdutils coreutils cpp-4.2 debconf debconf-i18n debianutils g++-4.2
+  gcc-4.1-base gcc-4.2 gcc-4.2-base gzip laptop-detect libc6 libc6-dev
+  libdb4.6 libgcc1 libgomp1 libncurses5 libncursesw5 libsasl2-2 libslang2
+  libssl0.9.8 libstdc++6 libstdc++6-4.2-dev man-db mount ncurses-base
+  ncurses-bin net-tools perl perl-base perl-modules tasksel tasksel-data
+  tzdata util-linux vim-common vim-tiny
+38 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 32.8MB of archives.
+After unpacking 1860kB disk space will be freed.
 Get:1 http://cdn.debian.or.jp sid/main coreutils 5.97-5.4 [3213kB]
-Get:2 http://cdn.debian.or.jp sid/main debianutils 2.25.2 [54.3kB]
+Get:2 http://cdn.debian.or.jp sid/main debianutils 2.26 [54.5kB]
 Get:3 http://cdn.debian.or.jp sid/main gzip 1.3.12-3.2 [106kB]
 Get:4 http://cdn.debian.or.jp sid/main libc6-dev 2.6.1-6 [2489kB]
 Get:5 http://cdn.debian.or.jp sid/main libgomp1 4.2.2-3 [13.4kB]
@@ -46,17 +47,26 @@ Get:16 http://cdn.debian.or.jp sid/main perl-modules 5.8.8-11.1 [2300kB]
 Get:17 http://cdn.debian.or.jp sid/main libdb4.6 4.6.21-3 [581kB]
 Get:18 http://cdn.debian.or.jp sid/main perl 5.8.8-11.1 [4052kB]
 Get:19 http://cdn.debian.or.jp sid/main perl-base 5.8.8-11.1 [837kB]
-Get:20 http://cdn.debian.or.jp sid/main ncurses-base 5.6+20071013-1 [13.2kB]
-Get:21 http://cdn.debian.or.jp sid/main libslang2 2.0.7-5 [459kB]
+Get:20 http://cdn.debian.or.jp sid/main debconf-i18n 1.5.15 [163kB]
+Get:21 http://cdn.debian.or.jp sid/main debconf 1.5.15 [151kB]
 Get:22 http://cdn.debian.or.jp sid/main tzdata 2007h-2 [724kB]
-Get:23 http://cdn.debian.or.jp sid/main laptop-detect 0.13.2 [4764B]
-Get:24 http://cdn.debian.or.jp sid/main libncursesw5 5.6+20071013-1 [361kB]
-Get:25 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-15 [108kB]
-Get:26 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8f-1 [944kB]
-Get:27 http://cdn.debian.or.jp sid/main man-db 2.5.0-3 [840kB]
-Get:28 http://cdn.debian.or.jp sid/main net-tools 1.60-17.1 [278kB]
-Get:29 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-138+1 [372kB]
-Get:30 http://cdn.debian.or.jp sid/main vim-common 1:7.1-138+1 [185kB]
+Get:23 http://cdn.debian.or.jp sid/main util-linux 2.13-9 [455kB]
+Get:24 http://cdn.debian.or.jp sid/main bsdutils 1:2.13-9 [94.2kB]
+Get:25 http://cdn.debian.or.jp sid/main mount 2.13-9 [134kB]
+Get:26 http://cdn.debian.or.jp sid/main ncurses-base 5.6+20071013-1 [13.2kB]
+Get:27 http://cdn.debian.or.jp sid/main libslang2 2.0.7-5 [459kB]
+Get:28 http://cdn.debian.or.jp sid/main laptop-detect 0.13.2 [4764B]
+Get:29 http://cdn.debian.or.jp sid/main libncursesw5 5.6+20071013-1 [361kB]
+Get:30 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-16 [108kB]
+Get:31 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8g-1 [944kB]
+Get:32 http://cdn.debian.or.jp sid/main man-db 2.5.0-3 [840kB]
+Get:33 http://cdn.debian.or.jp sid/main net-tools 1.60-17.1 [278kB]
+Get:34 http://cdn.debian.or.jp sid/main tasksel-data 2.69 [365kB]
+Get:35 http://cdn.debian.or.jp sid/main tasksel 2.69 [77.9kB]
+Get:36 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-138+1 [372kB]
+Get:37 http://cdn.debian.or.jp sid/main vim-common 1:7.1-138+1 [185kB]
+Get:38 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-17 [206kB]
+
Extracting templates from packages: 78%
Extracting templates from packages: 100%
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
 (Reading database ... 11354 files and directories currently installed.)
@@ -64,9 +74,9 @@ Preparing to replace coreutils 5.97-5.3 (using .../coreutils_5.97-5.4_amd64.deb)
 Unpacking replacement coreutils ...
 Setting up coreutils (5.97-5.4) ...
 (Reading database ... 11354 files and directories currently installed.)
-Preparing to replace debianutils 2.25.1 (using .../debianutils_2.25.2_amd64.deb) ...
+Preparing to replace debianutils 2.25.1 (using .../debianutils_2.26_amd64.deb) ...
 Unpacking replacement debianutils ...
-Setting up debianutils (2.25.2) ...
+Setting up debianutils (2.26) ...
 (Reading database ... 11354 files and directories currently installed.)
 Preparing to replace gzip 1.3.12-3.1 (using .../gzip_1.3.12-3.2_amd64.deb) ...
 Unpacking replacement gzip ...
@@ -118,16 +128,15 @@ Preparing to replace perl-base 5.8.8-7 (using .../perl-base_5.8.8-11.1_amd64.deb
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-11.1) ...
 (Reading database ... 10978 files and directories currently installed.)
-Preparing to replace ncurses-base 5.6+20070908-1 (using .../ncurses-base_5.6+20071013-1_all.deb) ...
-Unpacking replacement ncurses-base ...
-Setting up ncurses-base (5.6+20071013-1) ...
-(Reading database ... 10978 files and directories currently installed.)
-Preparing to replace libslang2 2.0.7-3 (using .../libslang2_2.0.7-5_amd64.deb) ...
-Unpacking replacement libslang2 ...
-Setting up libslang2 (2.0.7-5) ...
-(Reading database ... 10978 files and directories currently installed.)
+Preparing to replace debconf-i18n 1.5.14 (using .../debconf-i18n_1.5.15_all.deb) ...
+Unpacking replacement debconf-i18n ...
+Preparing to replace debconf 1.5.14 (using .../debconf_1.5.15_all.deb) ...
+Unpacking replacement debconf ...
 Preparing to replace tzdata 2007h-1 (using .../tzdata_2007h-2_all.deb) ...
 Unpacking replacement tzdata ...
+Setting up debconf-i18n (1.5.15) ...
+Setting up debconf (1.5.15) ...
+Installing new version of config file /etc/debconf.conf ...
 Setting up tzdata (2007h-2) ...
 
 Current default timezone: 'Etc/UTC'
@@ -135,23 +144,49 @@ Local time is now: XXXX
 Universal Time is now: XXXX
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
+(Reading database ... 10979 files and directories currently installed.)
+Preparing to replace util-linux 2.13-8 (using .../util-linux_2.13-9_amd64.deb) ...
+Unpacking replacement util-linux ...
+Setting up util-linux (2.13-9) ...
+(Reading database ... 10978 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.13-8 (using .../bsdutils_1%3a2.13-9_amd64.deb) ...
+Unpacking replacement bsdutils ...
+Setting up bsdutils (1:2.13-9) ...
+(Reading database ... 10978 files and directories currently installed.)
+Preparing to replace mount 2.13-8 (using .../mount_2.13-9_amd64.deb) ...
+Unpacking replacement mount ...
+Setting up mount (2.13-9) ...
+(Reading database ... 10978 files and directories currently installed.)
+Preparing to replace ncurses-base 5.6+20070908-1 (using .../ncurses-base_5.6+20071013-1_all.deb) ...
+Unpacking replacement ncurses-base ...
+Setting up ncurses-base (5.6+20071013-1) ...
+(Reading database ... 10978 files and directories currently installed.)
+Preparing to replace libslang2 2.0.7-3 (using .../libslang2_2.0.7-5_amd64.deb) ...
+Unpacking replacement libslang2 ...
+Setting up libslang2 (2.0.7-5) ...
 (Reading database ... 10978 files and directories currently installed.)
 Preparing to replace laptop-detect 0.12.1-0.1 (using .../laptop-detect_0.13.2_amd64.deb) ...
 Unpacking replacement laptop-detect ...
 Preparing to replace libncursesw5 5.6+20070908-1 (using .../libncursesw5_5.6+20071013-1_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
-Preparing to replace libsasl2-2 2.1.22.dfsg1-14 (using .../libsasl2-2_2.1.22.dfsg1-15_amd64.deb) ...
+Preparing to replace libsasl2-2 2.1.22.dfsg1-14 (using .../libsasl2-2_2.1.22.dfsg1-16_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
-Preparing to replace libssl0.9.8 0.9.8e-9 (using .../libssl0.9.8_0.9.8f-1_amd64.deb) ...
+Preparing to replace libssl0.9.8 0.9.8e-9 (using .../libssl0.9.8_0.9.8g-1_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
 Preparing to replace man-db 2.4.4-4 (using .../man-db_2.5.0-3_amd64.deb) ...
 Unpacking replacement man-db ...
 Preparing to replace net-tools 1.60-17 (using .../net-tools_1.60-17.1_amd64.deb) ...
 Unpacking replacement net-tools ...
+Preparing to replace tasksel-data 2.68 (using .../tasksel-data_2.69_all.deb) ...
+Unpacking replacement tasksel-data ...
+Preparing to replace tasksel 2.68 (using .../archives/tasksel_2.69_all.deb) ...
+Unpacking replacement tasksel ...
 Preparing to replace vim-tiny 1:7.1-056+2 (using .../vim-tiny_1%3a7.1-138+1_amd64.deb) ...
 Unpacking replacement vim-tiny ...
 Preparing to replace vim-common 1:7.1-056+2 (using .../vim-common_1%3a7.1-138+1_amd64.deb) ...
 Unpacking replacement vim-common ...
+Preparing to replace gcc-4.1-base 4.1.2-16 (using .../gcc-4.1-base_4.1.2-17_amd64.deb) ...
+Unpacking replacement gcc-4.1-base ...
 Setting up libc6-dev (2.6.1-6) ...
 Setting up libgomp1 (4.2.2-3) ...
 Setting up cpp-4.2 (4.2.2-3) ...
@@ -159,15 +194,18 @@ Setting up gcc-4.2 (4.2.2-3) ...
 Setting up libdb4.6 (4.6.21-3) ...
 Setting up laptop-detect (0.13.2) ...
 Setting up libncursesw5 (5.6+20071013-1) ...
-Setting up libsasl2-2 (2.1.22.dfsg1-15) ...
-Setting up libssl0.9.8 (0.9.8f-1) ...
+Setting up libsasl2-2 (2.1.22.dfsg1-16) ...
+Setting up libssl0.9.8 (0.9.8g-1) ...
 Setting up man-db (2.5.0-3) ...
 Installing new version of config file /etc/manpath.config ...
 Setting up net-tools (1.60-17.1) ...
 Setting up vim-common (1:7.1-138+1) ...
 Setting up vim-tiny (1:7.1-138+1) ...
+Setting up gcc-4.1-base (4.1.2-17) ...
+Setting up tasksel-data (2.69) ...
 Setting up g++-4.2 (4.2.2-3) ...
 Setting up perl-modules (5.8.8-11.1) ...
+Setting up tasksel (2.69) ...
 Setting up libstdc++6-4.2-dev (4.2.2-3) ...
 Setting up perl (5.8.8-11.1) ...
 Reading package lists...
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 1c69a22..f9ebc89 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -451,7 +451,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Oct 19 03:10:49 UTC 2007
+Mon Oct 22 03:10:10 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -521,14 +521,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Oct 19 03:10:54 UTC 2007
+Mon Oct 22 03:10:15 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-internal-lenny.log b/testsuite/normal/pdebuild-internal-lenny.log
index 3702f4b..555af53 100644
--- a/testsuite/normal/pdebuild-internal-lenny.log
+++ b/testsuite/normal/pdebuild-internal-lenny.log
@@ -464,10 +464,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
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-a: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -479,7 +479,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Oct 19 03:20:33 UTC 2007
+Mon Oct 22 03:19:08 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -549,7 +549,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
-Fri Oct 19 03:20:38 UTC 2007
+Mon Oct 22 03:19:13 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 962af57..563f9e4 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -20,24 +20,24 @@ Recommended packages:
 The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 pbuilder
 0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
-Need to get 241kB of archives.
+Need to get 242kB of archives.
 After unpacking 1102kB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main libdebian-installer4 0.52 [28.0kB]
-Get:2 http://cdn.debian.or.jp sid/main libdebian-installer-extra4 0.52 [10.7kB]
+Get:1 http://cdn.debian.or.jp sid/main libdebian-installer4 0.53 [28.9kB]
+Get:2 http://cdn.debian.or.jp sid/main libdebian-installer-extra4 0.53 [10.7kB]
 Get:3 http://cdn.debian.or.jp sid/main cdebootstrap 0.4.3 [29.0kB]
 Get:4 http://cdn.debian.or.jp sid/main pbuilder 0.173 [173kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 11001 files and directories currently installed.)
-Unpacking libdebian-installer4 (from .../libdebian-installer4_0.52_amd64.deb) ...
+Unpacking libdebian-installer4 (from .../libdebian-installer4_0.53_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
-Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.52_amd64.deb) ...
+Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.53_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.4.3_amd64.deb) ...
 Selecting previously deselected package pbuilder.
 Unpacking pbuilder (from .../pbuilder_0.173_all.deb) ...
-Setting up libdebian-installer4 (0.52) ...
-Setting up libdebian-installer-extra4 (0.52) ...
+Setting up libdebian-installer4 (0.53) ...
+Setting up libdebian-installer-extra4 (0.53) ...
 Setting up cdebootstrap (0.4.3) ...
 Setting up pbuilder (0.173) ...
 Setting DEBBUILDOPTS=
@@ -99,7 +99,7 @@ Get:4 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-2 [133kB]
 Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-2 [2269kB]
 Get:6 http://cdn.debian.or.jp sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.9 [117kB]
-Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.57 [519kB]
+Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.58 [519kB]
 Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.13-1 [11.0kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.13-1 [25.4kB]
 Get:11 http://cdn.debian.or.jp sid/main libsgmls-perl 1.03ii-31 [29.3kB]
@@ -123,7 +123,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) .
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_1.0.9_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.57_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.58_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -143,7 +143,7 @@ Setting up gettext-base (0.16.1-2) ...
 Setting up gettext (0.16.1-2) ...
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.9) ...
-Setting up debhelper (5.0.57) ...
+Setting up debhelper (5.0.58) ...
 Setting up libdshconfig1 (0.20.13-1) ...
 Setting up libdshconfig1-dev (0.20.13-1) ...
 Setting up libsgmls-perl (1.03ii-31) ...
@@ -425,7 +425,6 @@ make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9/po'
 make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  dsh
 make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
-make[3]: `dsh' is up to date.
 make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.9'
 /usr/bin/make  check-TESTS
 make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.9'
@@ -464,10 +463,10 @@ success
 success
 success
 success
-b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -479,7 +478,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Oct 19 03:05:49 UTC 2007
+Mon Oct 22 03:05:00 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -549,14 +548,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Oct 19 03:05:54 UTC 2007
+Mon Oct 22 03:05:05 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index a566708..f314703 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -481,7 +481,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Oct 19 03:09:55 UTC 2007
+Mon Oct 22 03:09:18 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -551,13 +551,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Oct 19 03:10:00 UTC 2007
+Mon Oct 22 03:09:23 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
-a: a
 dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
diff --git a/testsuite/normal/pdebuild-normal-lenny.log b/testsuite/normal/pdebuild-normal-lenny.log
index a171284..9b715eb 100644
--- a/testsuite/normal/pdebuild-normal-lenny.log
+++ b/testsuite/normal/pdebuild-normal-lenny.log
@@ -471,9 +471,9 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: 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
@@ -486,7 +486,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Oct 19 03:19:34 UTC 2007
+Mon Oct 22 03:18:21 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -556,13 +556,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Oct 19 03:19:39 UTC 2007
+Mon Oct 22 03:18:26 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
-b: b
 c: c
+b: b
+a: a
 dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 34c86b6..d88f3a8 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -96,7 +96,7 @@ Get:4 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-2 [133kB]
 Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-2 [2269kB]
 Get:6 http://cdn.debian.or.jp sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.9 [117kB]
-Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.57 [519kB]
+Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.58 [519kB]
 Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.13-1 [11.0kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.13-1 [25.4kB]
 Get:11 http://cdn.debian.or.jp sid/main libsgmls-perl 1.03ii-31 [29.3kB]
@@ -120,7 +120,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) .
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_1.0.9_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.57_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.58_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.13-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -140,7 +140,7 @@ Setting up gettext-base (0.16.1-2) ...
 Setting up gettext (0.16.1-2) ...
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.9) ...
-Setting up debhelper (5.0.57) ...
+Setting up debhelper (5.0.58) ...
 Setting up libdshconfig1 (0.20.13-1) ...
 Setting up libdshconfig1-dev (0.20.13-1) ...
 Setting up libsgmls-perl (1.03ii-31) ...
@@ -447,7 +447,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
@@ -471,10 +470,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
-b: 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
@@ -486,7 +485,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Fri Oct 19 03:04:51 UTC 2007
+Mon Oct 22 03:04:09 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -556,14 +555,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Fri Oct 19 03:04:56 UTC 2007
+Mon Oct 22 03:04:14 UTC 2007
 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
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh