merge changelog

34 files changed, 914 insertions, 866 deletions

diff --git a/ChangeLog b/ChangeLog
index cad63ae..7bb4ea2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
 
 	* pbuilder-user-mode-linux.1, etc.: 409135: SEE ALSO fix.
 
+2007-04-01  Loic Minier <lool@dooz.org>
+
+	* pbuilder-satisfydepends*:
+	- Modularize with new -funcs and -checkparams shared sources.
+	- New pbuilder-satisfydepends-aptitude resolver based on aptitude.
+	- Cleanups.
+
 2007-03-31  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder-user-mode-linux: spacing fix.
diff --git a/Makefile b/Makefile
index 7831be7..a24c194 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ SHELLCODES=pbuilder-buildpackage \
 	pbuilder-modules \
 	pbuilder-runhooks \
 	pbuilder-satisfydepends \
+	pbuilder-satisfydepends-aptitude \
 	pbuilder-satisfydepends-experimental \
 	pbuilder-updatebuildenv \
 	pbuilder-user-mode-linux \
@@ -71,6 +72,7 @@ install:
 	$(INSTALL_EXECUTABLE) pdebuild-user-mode-linux $(DESTDIR)/usr/bin
 	$(INSTALL_EXECUTABLE) debuild-pbuilder $(DESTDIR)/usr/bin
 	$(INSTALL_EXECUTABLE) pbuilder-satisfydepends $(DESTDIR)/usr/lib/pbuilder/
+	$(INSTALL_EXECUTABLE) pbuilder-satisfydepends-aptitude $(DESTDIR)/usr/lib/pbuilder/
 	$(INSTALL_EXECUTABLE) pbuilder-satisfydepends-experimental $(DESTDIR)/usr/lib/pbuilder/
 	$(INSTALL_EXECUTABLE) pdebuild-internal $(DESTDIR)/usr/lib/pbuilder/
 	$(INSTALL_FILE) pbuilderrc $(DESTDIR)/etc
diff --git a/debian/changelog b/debian/changelog
index 7d3f0f5..d28facb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,11 @@ pbuilder (0.166) UNRELEASED; urgency=low
     (Closes: #416920).
   * Manual page SEE ALSO fix, '.RI'->'.BR' (closes: #409135)
 
- --
+  [ Loic Minier ]
+  * New pbuilder-satisfydepends-aptitude resolver based on aptitude; based on
+    an idea by Mike Hommey; closes: #337015.
+
+ -- Junichi Uekawa <dancer@debian.org>  Mon,  2 Apr 2007 08:42:59 +0900
 
 pbuilder (0.165) unstable; urgency=low
 
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends
index b619544..e0f7659 100644..100755
--- a/pbuilder-satisfydepends
+++ b/pbuilder-satisfydepends
@@ -15,73 +15,12 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
 #
-# module to satisfy dependency.
+# module to satisfy build dependencies; default flavor
 
 set -e
 
-function checkbuilddep_versiondeps () {
-    local PACKAGE="$1"
-    local COMPARESTRING="$2"
-    local DEPSVERSION="$3"
-    local PACKAGEVERSIONS=$( ( $CHROOTEXEC /usr/bin/apt-cache show "$PACKAGE" ) | sed -n  's/^Version: \(.*\)$/\1/p' | xargs)
-    # no versioned provides.
-    if [ "${FORCEVERSION}" = "yes" ]; then
-	return 0;
-    fi
-    for PACKAGEVERSION in $PACKAGEVERSIONS ; do
-      if dpkg --compare-versions "$PACKAGEVERSION" "$COMPARESTRING" "$DEPSVERSION"; then
-	# satisfies depends
-	return 0;
-      fi
-    done
-    echo "      Tried versions: $PACKAGEVERSIONS"
-    # cannot satisfy depends
-    return 1;
-}
-
-function expand_arch () {
-    local ARCH="$1"
-    local EXPANDED_ARCH
-    
-    # just keep the original behavior.
-    echo "$ARCH"
-    return
-
-    # the following may be used if dpkg change is set to stone.
-    if echo "$ARCH" | grep "-" > /dev/null; then
-        EXPANDED_ARCH=$ARCH
-    else
-        EXPANDED_ARCH="linux-$ARCH"
-    fi
-    local WC1=$(echo $EXPANDED_ARCH | sed 's/^[^-]*/any/')
-    local WC2=$(echo $EXPANDED_ARCH | sed 's/[^-]*$/any/')
-    echo "$ARCH\\|$EXPANDED_ARCH\\|$WC1\\|$WC2"
-}
-
-function checkbuilddep_archdeps () {
-    # returns FALSE on INSTALL
-    local INSTALLPKG="$1"
-    local ARCH="$2"
-    if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/][!]\($(expand_arch $ARCH)\)[]/]" > /dev/null; then
-	# if !$ARCH exists in there, ERROR.
-	return 0;
-    fi
-    if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[!]" > /dev/null; then
-	if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]\($(expand_arch $ARCH)\)[]/]" > /dev/null; then
-	# if $ARCH does not exist, ERROR.
-	    return 0;
-	fi
-    fi
-    return 1;
-}
-
-function checkbuilddep_provides () {
-    local PACKAGENAME="$1"
-    # PROVIDED needs to be used outside of this function.
-    PROVIDED=$($CHROOTEXEC /usr/bin/apt-cache showpkg $PACKAGENAME | awk '{p=0}/^Reverse Provides:/,/^$/{p=1}{if(p && ($0 !~ "Reverse Provides:")){PACKAGE=$1}} END{print PACKAGE}')
-}
+. /usr/lib/pbuilder/pbuilder-satisfydepends-funcs
 
 function checkbuilddep_internal () {
 # Use this function to fulfill the dependency (almost)
@@ -93,61 +32,53 @@ function checkbuilddep_internal () {
     local CURRENTREALPKGNAME
     local SATISFIED
     echo " -> Attempting to parse the build-deps $Id$"
-    for INSTALLPKGMULTI in $(cat ${DEBIAN_CONTROL} | \
-	awk '
-BEGIN{source=1} 
-/^$/      {source=0} 
-/^Source:/      {source=1} 
-/^[^ ]*:/ {p=0} 
-tolower($0) ~ /^'"${BD_REGEXP}"':/   {p=1} 
-{if(p && source) {print $0}}'  | \
-	sed 's/^[^: ]*://' | \
+    for INSTALLPKGMULTI in $(get_control_re "$DEBIAN_CONTROL" "$BD_REGEXP" |
 	tr " " "/" | \
 	awk 'BEGIN{RS=","} {print}'); do
       echo " -> Considering build-dep$(echo "$INSTALLPKGMULTI" | tr "/" " " )"
       SATISFIED="no"
       for INSTALLPKG in $(echo "$INSTALLPKGMULTI" | \
 	  awk 'BEGIN{RS="|"} {print}'); do
-	CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')
-	if echo "$INSTALLPKG" | grep '\[' > /dev/null ; then
+	CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed -e 's#^/*##' -e 's#[[/(].*##')
+	if echo "$INSTALLPKG" | grep -q '\['; then
 	    if checkbuilddep_archdeps "$INSTALLPKG" "$ARCH"; then
 		SATISFIED="yes"
 		echo "   -> This package is not for this architecture"
-		continue;
+		continue
 	    fi
 	fi
-	if echo "$INSTALLPKG" | grep '[(]' > /dev/null; then
+	if echo "$INSTALLPKG" | grep -q '('; then
 	    #echo "Debug: $INSTALLPKG"
-	    if ! checkbuilddep_versiondeps ${CURRENTREALPKGNAME} \
-		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/') \
-		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/') ; then
+	    if ! checkbuilddep_versiondeps $CURRENTREALPKGNAME \
+		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\1/') \
+		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\2/') ; then
 	      echo "   -> Does not satisfy version, not trying"
-	      continue;
+	      continue
 	    fi
 	fi
-	echo "   -> Trying ${CURRENTREALPKGNAME}"
+	echo "   -> Trying $CURRENTREALPKGNAME"
 
-	if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${CURRENTREALPKGNAME} >& /dev/null; then
+	if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST $CURRENTREALPKGNAME >& /dev/null; then
 	    SATISFIED="yes"
-	    INSTALLPKGLIST="${INSTALLPKGLIST} ${CURRENTREALPKGNAME}"
+	    INSTALLPKGLIST="$INSTALLPKGLIST $CURRENTREALPKGNAME"
 	else
-	    echo "       -> Cannot install ${CURRENTREALPKGNAME}; apt errors follow:"
-	    if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} "${CURRENTREALPKGNAME}"; then
+	    echo "       -> Cannot install $CURRENTREALPKGNAME; apt errors follow:"
+	    if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST "$CURRENTREALPKGNAME"; then
 		:
 	    fi
 	    # package could not be found. -- looking for alternative.
 	    PROVIDED=""
-	    checkbuilddep_provides "${CURRENTREALPKGNAME}"
+	    checkbuilddep_provides "$CURRENTREALPKGNAME"
 	    if [ -n "$PROVIDED" ]; then
 		# something provides this package
 		echo "     -> Considering $PROVIDED to satisfy the dependency "
-		if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${PROVIDED} >& /dev/null; then
+		if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST $PROVIDED >& /dev/null; then
 		    SATISFIED="yes";
-		    INSTALLPKGLIST="${INSTALLPKGLIST} ${PROVIDED}"
+		    INSTALLPKGLIST="$INSTALLPKGLIST $PROVIDED"
 		else
 		    # show the error for diagnostic purposes
 		    echo "       -> Cannot install $PROVIDED; apt errors follow:"
-		    if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${PROVIDED}; then
+		    if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST $PROVIDED; then
 			:
 		    fi
 		fi
@@ -166,11 +97,11 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/   {p=1}
     done;
     
     # now actually install the packages
-    echo " -> Installing ${INSTALLPKGLIST}"
-    if ! $CHROOTEXEC apt-get -y --force-yes install ${INSTALLPKGLIST}; then
+    echo " -> Installing $INSTALLPKGLIST"
+    if ! $CHROOTEXEC apt-get -y --force-yes install $INSTALLPKGLIST; then
 	echo " -> Trying to fix apt error"
 	# Work around an apt bug which causes configure to fail.
-	if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y --force-yes install ${INSTALLPKGLIST}; then
+	if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y --force-yes install $INSTALLPKGLIST; then
 	    echo " -> Apt bug workaround succeeded"
 	elif [ "$CONTINUE_FAIL" != "yes" ]; then
 	    echo "E: Unrecoverable error installing build-dependencies." >&2
@@ -179,44 +110,37 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/   {p=1}
     fi
 
     # start processing build-conflicts.
-    for INSTALLPKG in $(cat "${DEBIAN_CONTROL}" | \
-	awk 'BEGIN{source=1} 
-/^$/      {source=0} 
-/^Source:/      {source=1} 
-/^[^ ]*:/{p=0} 
-tolower($0) ~ /^'"${BC_REGEXP}"':/   {p=1} 
-{if(p && source) {print $0}}'  | \
-	sed 's/^[^: ]*://' | \
+    for INSTALLPKG in $(get_control_re "$DEBIAN_CONTROL" "$BC_REGEXP" |
 	tr " " "/" | \
 	awk 'BEGIN{RS=","} {print}'); do
-      CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')
-      echo " -> Considering ${CURRENTREALPKGNAME}"
+      CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed -e 's#^/*##' -e 's#[[/(].*##')
+      echo " -> Considering $CURRENTREALPKGNAME"
       
-      if echo "$INSTALLPKG" | grep '\[' > /dev/null ; then
+      if echo "$INSTALLPKG" | grep -q '\['; then
 	  # this package has arch-conflicts.
 	  if checkbuilddep_archdeps "$INSTALLPKG" "$ARCH"; then
 	      echo "I: Ignoring other-arch"
-	      continue;
+	      continue
 	  fi
       fi
-      if echo "$INSTALLPKG" | grep '[(]' > /dev/null ; then
+      if echo "$INSTALLPKG" | grep -q '('; then
 	  # this package has version-conflicts
-	  if ! checkbuilddep_versiondeps ${CURRENTREALPKGNAME} \
-		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/') \
-		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/'); then
+	  if ! checkbuilddep_versiondeps $CURRENTREALPKGNAME \
+		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\1/') \
+		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\2/'); then
 	      echo "I: Satisfies version, not trying"
-	      continue;
+	      continue
 	  fi
       fi
 
       # if package exists, remove it.
-      if $CHROOTEXEC /usr/bin/dpkg -s $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') 2>&1 | grep ^Package: > /dev/null; then
-	  if ! $CHROOTEXEC /usr/bin/apt-get -y remove ${CURRENTREALPKGNAME} ; then
+      if $CHROOTEXEC /usr/bin/dpkg -s $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') 2>&1 | grep -q ^Package:; then
+	  if ! $CHROOTEXEC /usr/bin/apt-get -y remove $CURRENTREALPKGNAME ; then
 	      echo "E: Could not satisfy build-conflicts" >&2
 	      exit 1
 	  fi
       else
-	  echo "I: ${CURRENTREALPKGNAME} package is not installed, no need to remove"
+	  echo "I: $CURRENTREALPKGNAME package is not installed, no need to remove"
       fi
     done
     echo " -> Finished parsing the build-deps"
@@ -241,57 +165,5 @@ Copyright 2002-2007  Junichi Uekawa <dancer@debian.org>
 EOF
 }
 
+. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams
 
-DEBIAN_CONTROL=debian/control
-CHROOTEXEC=""
-BD_REGEXP="build-(depends|depends-indep)"
-BC_REGEXP="build-(conflicts|conflicts-indep)"
-FORCEVERSION=""
-CONTINUE_FAIL="no"
-
-
-while [ -n "$1" ]; do
-    case "$1" in
-	--control|-c)
-	    DEBIAN_CONTROL="$2"
-	    shift; shift
-	    ;;
-	--chroot)
-	    CHROOTEXEC="chroot $2 "
-	    shift; shift
-	    ;;
-	--internal-chrootexec)
-	    CHROOTEXEC="$2"
-	    shift; shift 
-	    ;;
-	--binary-all)
-	    BD_REGEXP='build-(depends|depends-indep)'
-	    BC_REGEXP='build-(conflicts|conflicts-indep)'
-	    shift
-	    ;;
-	--binary-arch)
-	    BD_REGEXP='build-depends'
-	    BC_REGEXP='build-conflicts'
-	    shift
-	    ;;
-	--echo)
-	    CHROOTEXEC="echo $CHROOTEXEC"
-	    shift
-	    ;;
-	--continue-fail)
-	    CONTINUE_FAIL="yes"
-	    shift
-	    ;;
-	--force-version)
-	    FORCEVERSION="yes"
-	    shift;
-	    ;;
-	--help|-h|*)
-	    print_help
-	    exit 1
-	    ;;
-    esac
-done
-
-
-checkbuilddep_internal
diff --git a/pbuilder-satisfydepends-aptitude b/pbuilder-satisfydepends-aptitude
new file mode 100755
index 0000000..6f94d74
--- /dev/null
+++ b/pbuilder-satisfydepends-aptitude
@@ -0,0 +1,113 @@
+#!/bin/bash
+#   pbuilder -- personal Debian package builder
+#   Copyright (C) 2001,2002,2003,2005-2007 Junichi Uekawa
+#   Copyright (C) 2007 Loïc Minier
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+# module to satisfy build dependencies; aptitude flavor
+
+set -e
+
+. /usr/lib/pbuilder/pbuilder-satisfydepends-funcs
+
+# filter out dependencies sent on input not for this arch; deps can have
+# multiple lines; output is on a single line or "" if empty
+function filter_arch_deps() {
+    local arch="$1"
+    local INSTALLPKGMULTI
+    local INSTALLPKG
+
+    # split on ","
+    sed 's/[[:space:]]*,[[:space:]]*/\n/g' |
+    while read INSTALLPKGMULTI; do
+        echo "$INSTALLPKGMULTI" |
+            # split on "|"
+            sed 's/[[:space:]]*|[[:space:]]*/\n/g' |
+            while read INSTALLPKG; do
+                if echo "$INSTALLPKG" | grep -q '\['; then
+                    if checkbuilddep_archdeps "$INSTALLPKG" "$ARCH"; then
+                        continue
+                    fi
+                fi
+                # output the selected package
+                echo "$INSTALLPKG"
+            done |
+            # remove the arch list and add " | " between entries
+            sed 's/\[.*\]//; $,$! s/$/ |/' |
+            xargs --no-run-if-empty
+    done |
+    # add ", " between entries
+    sed '$,$! s/$/,/' |
+    xargs --no-run-if-empty
+}
+
+function checkbuilddep_internal () {
+# Use this function to fulfill the dependency (almost)
+    local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
+    local BUILD_DEP_DEB_DIR
+    local BUILD_DEP_DEB_CONTROL
+    local DEPENDS
+    local CONFLICTS
+    echo " -> Attempting to satisfy build-dependencies $Id$"
+    DEPENDS="$(get_control_re "$DEBIAN_CONTROL" "$BD_REGEXP" | filter_arch_deps "$ARCH")"
+    CONFLICTS="$(get_control_re "$DEBIAN_CONTROL" "$BC_REGEXP" | filter_arch_deps "$ARCH")"
+    echo " -> Creating pbuilder-satisfydepends-dummy package"
+    BUILD_DEP_DEB_DIR="/tmp/satisfydepends-aptitude"
+    BUILD_DEP_DEB_CONTROL="$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy/DEBIAN/control"
+    $CHROOTEXEC mkdir -p "$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy/DEBIAN/"
+    $CHROOTEXEC sh -c "cat >\"$BUILD_DEP_DEB_CONTROL\"" <<EOF
+Package: pbuilder-satisfydepends-dummy
+Version: 0.invalid.0
+Architecture: $ARCH
+Maintainer: Debian Pbuilder Team <pbuilder-maint@lists.alioth.debian.org>
+Description: Dummy package to satisfy dependencies with aptitude - created by pbuilder
+ This package was created automatically by pbuilder and should
+EOF
+    if [ -n "$DEPENDS" ]; then
+        $CHROOTEXEC sh -c "echo \"Depends: $DEPENDS\" >>\"$BUILD_DEP_DEB_CONTROL\""
+    fi
+    if [ -n "$CONFLICTS" ]; then
+        $CHROOTEXEC sh -c "echo \"Conflicts: $CONFLICTS\" >>\"$BUILD_DEP_DEB_CONTROL\""
+    fi
+    $CHROOTEXEC sh -c "cat \"$BUILD_DEP_DEB_CONTROL\""
+    $CHROOTEXEC sh -c "dpkg-deb -b \"$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy\""
+    $CHROOTEXEC apt-get -y --force-yes install aptitude
+    $CHROOTEXEC dpkg -i "$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy.deb" || true
+    $CHROOTEXEC aptitude -y install pbuilder-satisfydepends-dummy
+    echo " -> Finished parsing the build-deps"
+}
+
+
+function print_help () {
+    # print out help message
+    cat <<EOF
+pbuilder-satisfydepends -- satisfy dependencies
+Copyright 2002-2007  Junichi Uekawa <dancer@debian.org>
+
+--help:        give help
+--control:     specify control file (debian/control, *.dsc)
+--chroot:      operate inside chroot
+--binary-all:  include binary-all
+--binary-arch: include binary-arch only
+--echo:        echo mode, do nothing. (--force-version required for most operation)
+--force-version: skip version check.
+--continue-fail: continue even when failed.
+
+EOF
+}
+
+. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams
+
diff --git a/pbuilder-satisfydepends-checkparams b/pbuilder-satisfydepends-checkparams
new file mode 100755
index 0000000..3314c64
--- /dev/null
+++ b/pbuilder-satisfydepends-checkparams
@@ -0,0 +1,74 @@
+#!/bin/bash
+#   pbuilder -- personal Debian package builder
+#   Copyright (C) 2001,2002,2003,2005-2007 Junichi Uekawa
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+# module to satisfy build dependencies; parse command line parameters
+
+
+DEBIAN_CONTROL=debian/control
+CHROOTEXEC=""
+BD_REGEXP="build-(depends|depends-indep)"
+BC_REGEXP="build-(conflicts|conflicts-indep)"
+FORCEVERSION=""
+CONTINUE_FAIL="no"
+
+
+while [ -n "$1" ]; do
+    case "$1" in
+	--control|-c)
+	    DEBIAN_CONTROL="$2"
+	    shift; shift
+	    ;;
+	--chroot)
+	    CHROOTEXEC="chroot $2 "
+	    shift; shift
+	    ;;
+	--internal-chrootexec)
+	    CHROOTEXEC="$2"
+	    shift; shift 
+	    ;;
+	--binary-all)
+	    BD_REGEXP='build-(depends|depends-indep)'
+	    BC_REGEXP='build-(conflicts|conflicts-indep)'
+	    shift
+	    ;;
+	--binary-arch)
+	    BD_REGEXP='build-depends'
+	    BC_REGEXP='build-conflicts'
+	    shift
+	    ;;
+	--echo)
+	    CHROOTEXEC="echo $CHROOTEXEC"
+	    shift
+	    ;;
+	--continue-fail)
+	    CONTINUE_FAIL="yes"
+	    shift
+	    ;;
+	--force-version)
+	    FORCEVERSION="yes"
+	    shift;
+	    ;;
+	--help|-h|*)
+	    print_help
+	    exit 1
+	    ;;
+    esac
+done
+
+
+checkbuilddep_internal
diff --git a/pbuilder-satisfydepends-experimental b/pbuilder-satisfydepends-experimental
index 7f5f73d..39a3a2b 100755
--- a/pbuilder-satisfydepends-experimental
+++ b/pbuilder-satisfydepends-experimental
@@ -1,6 +1,7 @@
 #!/bin/bash
 #   pbuilder -- personal Debian package builder
 #   Copyright (C) 2001,2002,2003,2005-2007 Junichi Uekawa
+#   Copyright (C) 2006,2007 Loïc Minier
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -15,129 +16,15 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
 #
-# module to satisfy dependency.
+# module to satisfy build dependencies; experimental flavor
 
 set -e
 
-function package_versions() {
-	local PACKAGE="$1"
-	( $CHROOTEXEC /usr/bin/apt-cache show "$PACKAGE" ) | sed -n 's/^Version: \(.*\)$/\1/p'
-}
-
-function candidate_version() {
-	local PACKAGE="$1"
-	LC_ALL=C $CHROOTEXEC apt-cache policy "$PACKAGE" | sed -n 's/ *Candidate: *\(.*\)/\1/p'
-}
-
-function checkbuilddep_versiondeps () {
-    local PACKAGE="$1"
-    local COMPARESTRING="$2"
-    local DEPSVERSION="$3"
-    local PACKAGEVERSIONS=$( package_versions "$PACKAGE" | xargs)
-    # no versioned provides.
-    if [ "${FORCEVERSION}" = "yes" ]; then
-	return 0;
-    fi
-    for PACKAGEVERSION in $PACKAGEVERSIONS ; do
-      if dpkg --compare-versions "$PACKAGEVERSION" "$COMPARESTRING" "$DEPSVERSION"; then
-	# satisfies depends
-	return 0;
-      fi
-    done
-    echo "      Tried versions: $PACKAGEVERSIONS"
-    # cannot satisfy depends
-    return 1;
-}
-
-function expand_arch () {
-    local ARCH="$1"
-    local EXPANDED_ARCH
-    
-    # just keep the original behavior.
-    echo "$ARCH"
-    return
-
-    # the following may be used if dpkg change is set to stone.
-    if echo "$ARCH" | grep "-" > /dev/null; then
-        EXPANDED_ARCH=$ARCH
-    else
-        EXPANDED_ARCH="linux-$ARCH"
-    fi
-    local WC1=$(echo $EXPANDED_ARCH | sed 's/^[^-]*/any/')
-    local WC2=$(echo $EXPANDED_ARCH | sed 's/[^-]*$/any/')
-    echo "$ARCH\\|$EXPANDED_ARCH\\|$WC1\\|$WC2"
-}
-
-function checkbuilddep_archdeps () {
-    # returns FALSE on INSTALL
-    local INSTALLPKG="$1"
-    local ARCH="$2"
-    if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/][!]\($(expand_arch $ARCH)\)[]/]" > /dev/null; then
-	# if !$ARCH exists in there, ERROR.
-	return 0;
-    fi
-    if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[!]" > /dev/null; then
-	if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]\($(expand_arch $ARCH)\)[]/]" > /dev/null; then
-	# if $ARCH does not exist, ERROR.
-	    return 0;
-	fi
-    fi
-    return 1;
-}
+. /usr/lib/pbuilder/pbuilder-satisfydepends-funcs
 
-function checkbuilddep_provides () {
-    local PACKAGENAME="$1"
-    # PROVIDED needs to be used outside of this function.
-    PROVIDED=$($CHROOTEXEC /usr/bin/apt-cache showpkg $PACKAGENAME | awk '{p=0}/^Reverse Provides:/,/^$/{p=1}{if(p && ($0 !~ "Reverse Provides:")){PACKAGE=$1}} END{print PACKAGE}')
-}
-
-# returns either "package=version", to append to an apt-get install line, or
-# package
-function versioneddep_to_aptcmd () {
-	local INSTALLPKG="$1"
-
-	local PACKAGE
-	local PACKAGE_WITHVERSION
-	local PACKAGEVERSIONS
-	local CANDIDATE_VERSION
-	local COMPARESTRING
-	local DEPSVERSION
-
-	PACKAGE="$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')"
-	PACKAGE_WITHVERSION="$PACKAGE"
-
-	# if not versionned, we skip directly to outputting $PACKAGE
-	if echo "$INSTALLPKG" | grep '[(]' > /dev/null; then
-	    # package versions returned by APT, in reversed order
-	    PACKAGEVERSIONS="$( package_versions "$PACKAGE" | tac | xargs )"
-	    CANDIDATE_VERSION="$( candidate_version "$PACKAGE" )"
-
-	    COMPARESTRING="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/')"
-	    DEPSVERSION="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/')"
-	    # if strictly versionned, we skip to outputting that version
-	    if [ "=" = "$COMPARESTRING" ]; then
-		PACKAGE_WITHVERSION="$PACKAGE=$DEPSVERSION"
-	    else
-		# try the candidate version, then all available versions (asc)
-		for VERSION in $CANDIDATE_VERSION $PACKAGEVERSIONS; do
-		    if dpkg --compare-versions "$VERSION" "$COMPARESTRING" "$DEPSVERSION"; then
-			if [ $VERSION != $CANDIDATE_VERSION ]; then
-			    PACKAGE_WITHVERSION="$PACKAGE=$VERSION"
-			fi
-			break;
-		    fi
-		done
-	    fi
-	fi
-
-	echo "$PACKAGE_WITHVERSION"
-}
-
-function checkbuilddep_internal () {
 # Use this function to fulfill the dependency (almost)
-
+function checkbuilddep_internal () {
     local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
     local INSTALLPKG
     local INSTALLPKGLIST
@@ -147,38 +34,30 @@ function checkbuilddep_internal () {
     local PACKAGEVERSIONS
     local CANDIDATE_VERSION
     echo " -> Attempting to parse the build-deps $Id$"
-    for INSTALLPKGMULTI in $(cat ${DEBIAN_CONTROL} | \
-	awk '
-BEGIN{source=1} 
-/^$/      {source=0} 
-/^Source:/      {source=1} 
-/^[^ ]*:/ {p=0} 
-tolower($0) ~ /^'"${BD_REGEXP}"':/   {p=1} 
-{if(p && source) {print $0}}'  | \
-	sed 's/^[^: ]*://' | \
+    for INSTALLPKGMULTI in $(get_control_re "$DEBIAN_CONTROL" "$BD_REGEXP" |
 	tr " " "/" | \
 	awk 'BEGIN{RS=","} {print}'); do
       echo " -> Considering build-dep$(echo "$INSTALLPKGMULTI" | tr "/" " " )"
       SATISFIED="no"
       for INSTALLPKG in $(echo "$INSTALLPKGMULTI" | \
 	  awk 'BEGIN{RS="|"} {print}'); do
-	CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')
-	if echo "$INSTALLPKG" | grep '\[' > /dev/null ; then
+	CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed -e 's#^/*##' -e 's#[[/(].*##')
+	if echo "$INSTALLPKG" | grep -q '\['; then
 	    if checkbuilddep_archdeps "$INSTALLPKG" "$ARCH"; then
 		SATISFIED="yes"
 		echo "   -> This package is not for this architecture"
-		continue;
+		continue
 	    fi
 	fi
 
 	CURRENT_APT_COMMAND="$(versioneddep_to_aptcmd "$INSTALLPKG")"
 
 	while [ "$SATISFIED" = "no" ]; do
-	    echo "   -> Trying to add ${CURRENT_APT_COMMAND}"
-	    if APT_OUTPUT="$( exec 2>&1; LC_ALL=C $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${CURRENT_APT_COMMAND} )"; then
+	    echo "   -> Trying to add $CURRENT_APT_COMMAND"
+	    if APT_OUTPUT="$( exec 2>&1; LC_ALL=C $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST $CURRENT_APT_COMMAND )"; then
 		# success, we're done
 		SATISFIED="yes"
-		INSTALLPKGLIST="${INSTALLPKGLIST} ${CURRENT_APT_COMMAND}"
+		INSTALLPKGLIST="$INSTALLPKGLIST $CURRENT_APT_COMMAND"
 		break
 	    fi
 	    # try to parse APT's output to recognize lines such as:
@@ -205,23 +84,23 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/   {p=1}
 	    break;
 	fi
 
-	echo "       -> Cannot install ${CURRENT_APT_COMMAND}; apt errors follow:"
-	if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} "${CURRENT_APT_COMMAND}"; then
+	echo "       -> Cannot install $CURRENT_APT_COMMAND; apt errors follow:"
+	if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST "$CURRENT_APT_COMMAND"; then
 	    :
 	fi
 	# package could not be found. -- looking for alternative.
 	PROVIDED=""
-	checkbuilddep_provides "${CURRENTREALPKGNAME}"
+	checkbuilddep_provides "$CURRENTREALPKGNAME"
 	if [ -n "$PROVIDED" ]; then
 	    # something provides this package
 	    echo "     -> Considering $PROVIDED to satisfy the dependency "
-	    if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${PROVIDED} >& /dev/null; then
+	    if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST $PROVIDED >& /dev/null; then
 		SATISFIED="yes";
-		INSTALLPKGLIST="${INSTALLPKGLIST} ${PROVIDED}"
+		INSTALLPKGLIST="$INSTALLPKGLIST $PROVIDED"
 	    else
 		# show the error for diagnostic purposes
 		echo "       -> Cannot install $PROVIDED; apt errors follow:"
-		if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${PROVIDED}; then
+		if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST $PROVIDED; then
 		    :
 		fi
 	    fi
@@ -239,11 +118,11 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/   {p=1}
     done;
     
     # now actually install the packages
-    echo " -> Installing ${INSTALLPKGLIST}"
-    if ! $CHROOTEXEC apt-get -y --force-yes install ${INSTALLPKGLIST}; then
+    echo " -> Installing $INSTALLPKGLIST"
+    if ! $CHROOTEXEC apt-get -y --force-yes install $INSTALLPKGLIST; then
 	echo " -> Trying to fix apt error"
 	# Work around an apt bug which causes configure to fail.
-	if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y --force-yes install ${INSTALLPKGLIST}; then
+	if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y --force-yes install $INSTALLPKGLIST; then
 	    echo " -> Apt bug workaround succeeded"
 	elif [ "$CONTINUE_FAIL" != "yes" ]; then
 	    echo "E: Unrecoverable error installing build-dependencies." >&2
@@ -252,44 +131,37 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/   {p=1}
     fi
 
     # start processing build-conflicts.
-    for INSTALLPKG in $(cat "${DEBIAN_CONTROL}" | \
-	awk 'BEGIN{source=1} 
-/^$/      {source=0} 
-/^Source:/      {source=1} 
-/^[^ ]*:/{p=0} 
-tolower($0) ~ /^'"${BC_REGEXP}"':/   {p=1} 
-{if(p && source) {print $0}}'  | \
-	sed 's/^[^: ]*://' | \
+    for INSTALLPKG in $(get_control_re "$DEBIAN_CONTROL" "$BC_REGEXP" |
 	tr " " "/" | \
 	awk 'BEGIN{RS=","} {print}'); do
-      CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')
-      echo " -> Considering ${CURRENTREALPKGNAME}"
+      CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed -e 's#^/*##' -e 's#[[/(].*##')
+      echo " -> Considering $CURRENTREALPKGNAME"
       
-      if echo "$INSTALLPKG" | grep '\[' > /dev/null ; then
+      if echo "$INSTALLPKG" | grep -q '\['; then
 	  # this package has arch-conflicts.
 	  if checkbuilddep_archdeps "$INSTALLPKG" "$ARCH"; then
 	      echo "I: Ignoring other-arch"
-	      continue;
+	      continue
 	  fi
       fi
-      if echo "$INSTALLPKG" | grep '[(]' > /dev/null ; then
+      if echo "$INSTALLPKG" | grep -q '('; then
 	  # this package has version-conflicts
-	  if ! checkbuilddep_versiondeps ${CURRENTREALPKGNAME} \
-		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/') \
-		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/'); then
+	  if ! checkbuilddep_versiondeps $CURRENTREALPKGNAME \
+		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\1/') \
+		$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\2/'); then
 	      echo "I: Satisfies version, not trying"
-	      continue;
+	      continue
 	  fi
       fi
 
       # if package exists, remove it.
-      if $CHROOTEXEC /usr/bin/dpkg -s $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') 2>&1 | grep ^Package: > /dev/null; then
-	  if ! $CHROOTEXEC /usr/bin/apt-get -y remove ${CURRENTREALPKGNAME} ; then
+      if $CHROOTEXEC /usr/bin/dpkg -s $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') 2>&1 | grep -q ^Package:; then
+	  if ! $CHROOTEXEC /usr/bin/apt-get -y remove $CURRENTREALPKGNAME ; then
 	      echo "E: Could not satisfy build-conflicts" >&2
 	      exit 1
 	  fi
       else
-	  echo "I: ${CURRENTREALPKGNAME} package is not installed, no need to remove"
+	  echo "I: $CURRENTREALPKGNAME package is not installed, no need to remove"
       fi
     done
     echo " -> Finished parsing the build-deps"
@@ -314,57 +186,5 @@ Copyright 2002-2007  Junichi Uekawa <dancer@debian.org>
 EOF
 }
 
+. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams
 
-DEBIAN_CONTROL=debian/control
-CHROOTEXEC=""
-BD_REGEXP="build-(depends|depends-indep)"
-BC_REGEXP="build-(conflicts|conflicts-indep)"
-FORCEVERSION=""
-CONTINUE_FAIL="no"
-
-
-while [ -n "$1" ]; do
-    case "$1" in
-	--control|-c)
-	    DEBIAN_CONTROL="$2"
-	    shift; shift
-	    ;;
-	--chroot)
-	    CHROOTEXEC="chroot $2 "
-	    shift; shift
-	    ;;
-	--internal-chrootexec)
-	    CHROOTEXEC="$2"
-	    shift; shift 
-	    ;;
-	--binary-all)
-	    BD_REGEXP='build-(depends|depends-indep)'
-	    BC_REGEXP='build-(conflicts|conflicts-indep)'
-	    shift
-	    ;;
-	--binary-arch)
-	    BD_REGEXP='build-depends'
-	    BC_REGEXP='build-conflicts'
-	    shift
-	    ;;
-	--echo)
-	    CHROOTEXEC="echo $CHROOTEXEC"
-	    shift
-	    ;;
-	--continue-fail)
-	    CONTINUE_FAIL="yes"
-	    shift
-	    ;;
-	--force-version)
-	    FORCEVERSION="yes"
-	    shift;
-	    ;;
-	--help|-h|*)
-	    print_help
-	    exit 1
-	    ;;
-    esac
-done
-
-
-checkbuilddep_internal
diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs
new file mode 100755
index 0000000..0e8270c
--- /dev/null
+++ b/pbuilder-satisfydepends-funcs
@@ -0,0 +1,154 @@
+#!/bin/bash
+#   pbuilder -- personal Debian package builder
+#   Copyright (C) 2001,2002,2003,2005-2007 Junichi Uekawa
+#   Copyright (C) 2007 Loïc Minier
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+# module to satisfy build dependencies; common functions
+
+
+function package_versions() {
+	local PACKAGE="$1"
+	( $CHROOTEXEC /usr/bin/apt-cache show "$PACKAGE" ) | sed -n 's/^Version: \(.*\)$/\1/p'
+}
+
+function candidate_version() {
+	local PACKAGE="$1"
+	LC_ALL=C $CHROOTEXEC apt-cache policy "$PACKAGE" | sed -n 's/ *Candidate: *\(.*\)/\1/p'
+}
+
+function checkbuilddep_versiondeps () {
+    local PACKAGE="$1"
+    local COMPARESTRING="$2"
+    local DEPSVERSION="$3"
+    local PACKAGEVERSIONS=$( package_versions "$PACKAGE" | xargs)
+    # no versioned provides.
+    if [ "${FORCEVERSION}" = "yes" ]; then
+	return 0;
+    fi
+    for PACKAGEVERSION in $PACKAGEVERSIONS ; do
+      if dpkg --compare-versions "$PACKAGEVERSION" "$COMPARESTRING" "$DEPSVERSION"; then
+	# satisfies depends
+	return 0;
+      fi
+    done
+    echo "      Tried versions: $PACKAGEVERSIONS"
+    # cannot satisfy depends
+    return 1;
+}
+
+get_control_re() {
+    control="$1"
+    re="$2"
+
+    cat "$control" |
+        awk '
+        BEGIN { source=1 }
+        /^$/ { source=0 }
+        /^Source:/ { source=1 }
+        /^[^ ]*:/ { p=0 }
+        tolower($0) ~ /^'"$re"':/ { p=1 }
+        { if (p && source) { print $0 } }' |
+        sed 's/^[^: ]*://'
+}
+
+function checkbuilddep_archdeps () {
+    # returns FALSE on INSTALL
+    local INSTALLPKG="$1"
+    local ARCH="$2"
+    # architectures listed between [ and ] for this dep
+    local DEP_ARCHES="$(echo "$INSTALLPKG" | sed 's/.*\[\(.*\)\].*/\1/')"
+    # check for !$ARCH in DEP_ARCHES
+    if echo "$DEP_ARCHES" | egrep -q "(^|[[:space:]/]+)\![[:space:]/]*$ARCH($|[[:space:]/]+)"; then
+	return 0;
+    fi
+    # check for a "!" which would mean there's a !<otherarch> and hence $ARCH
+    # is included
+    if ! echo "$DEP_ARCHES" | grep -q '!'; then
+        # check for $ARCH in DEP_ARCHES
+	if ! echo "$DEP_ARCHES" | egrep -q "(^|[[:space:]/]+)$ARCH($|[[:space:]/]+)"; then
+	    return 0;
+	fi
+    fi
+    return 1;
+}
+
+function checkbuilddep_provides () {
+    local PACKAGENAME="$1"
+    # PROVIDED needs to be used outside of this function.
+    PROVIDED=$($CHROOTEXEC /usr/bin/apt-cache showpkg $PACKAGENAME | awk '{p=0}/^Reverse Provides:/,/^$/{p=1}{if(p && ($0 !~ "Reverse Provides:")){PACKAGE=$1}} END{print PACKAGE}')
+}
+
+# returns either "package=version", to append to an apt-get install line, or
+# package
+function versioneddep_to_aptcmd () {
+	local INSTALLPKG="$1"
+
+	local PACKAGE
+	local PACKAGE_WITHVERSION
+	local PACKAGEVERSIONS
+	local CANDIDATE_VERSION
+	local COMPARESTRING
+	local DEPSVERSION
+
+	PACKAGE="$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')"
+	PACKAGE_WITHVERSION="$PACKAGE"
+
+	# if not versionned, we skip directly to outputting $PACKAGE
+	if echo "$INSTALLPKG" | grep '[(]' > /dev/null; then
+	    # package versions returned by APT, in reversed order
+	    PACKAGEVERSIONS="$( package_versions "$PACKAGE" | tac | xargs )"
+	    CANDIDATE_VERSION="$( candidate_version "$PACKAGE" )"
+
+	    COMPARESTRING="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\1/')"
+	    DEPSVERSION="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\2/')"
+	    # if strictly versionned, we skip to outputting that version
+	    if [ "=" = "$COMPARESTRING" ]; then
+		PACKAGE_WITHVERSION="$PACKAGE=$DEPSVERSION"
+	    else
+		# try the candidate version, then all available versions (asc)
+		for VERSION in $CANDIDATE_VERSION $PACKAGEVERSIONS; do
+		    if dpkg --compare-versions "$VERSION" "$COMPARESTRING" "$DEPSVERSION"; then
+			if [ $VERSION != $CANDIDATE_VERSION ]; then
+			    PACKAGE_WITHVERSION="$PACKAGE=$VERSION"
+			fi
+			break;
+		    fi
+		done
+	    fi
+	fi
+
+	echo "$PACKAGE_WITHVERSION"
+}
+
+function print_help () {
+    # print out help message
+    cat <<EOF
+pbuilder-satisfydepends -- satisfy dependencies
+Copyright 2002-2007  Junichi Uekawa <dancer@debian.org>
+
+--help:        give help
+--control:     specify control file (debian/control, *.dsc)
+--chroot:      operate inside chroot
+--binary-all:  include binary-all
+--binary-arch: include binary-arch only
+--echo:        echo mode, do nothing. (--force-version required for most operation)
+--force-version: skip version check.
+--continue-fail: continue even when failed.
+
+EOF
+}
+
diff --git a/pbuilderrc b/pbuilderrc
index 7ec5f45..1b8da3b 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -35,10 +35,13 @@ BUILDSOURCEROOTCMD="fakeroot"
 PBUILDERROOTCMD="sudo"
 
 # command to satisfy build-dependencies; the default is an internal shell
-# implementation which is relatively slow; there's an alternate experimental
-# implementation, "pbuilder-satisfydepends-experimental", which might be useful
-# to pull packages from experimental or from repositories with a low APT Pin
-# Priority
+# implementation which is relatively slow; there are two alternate
+# implementations, the "experimental" implementation,
+# "pbuilder-satisfydepends-experimental", which might be useful to pull
+# packages from experimental or from repositories with a low APT Pin Priority,
+# and the "aptitude" implementation, which will resolve build-dependencies and
+# build-conflicts with aptitude which helps dealing with complex cases but does
+# not support unsigned APT repositories
 PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends"
 
 #default is to build everything. Passed on to dpkg-buildpackage
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 25ca11e..2612012 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -216,10 +216,12 @@ in
 .BI "PBUILDERSATISFYDEPENDSCMD=" "/usr/lib/pbuilder/pbuilder-satisfydepends"
 
 This option is used by various parts of pbuilder to satisfy (i.e. install) the
-build-dependencies of a package.  There is an alternate experimental
-implementation, "pbuilder-satisfydepends-experimental", which might be useful
-to pull packages from experimental or from repositories with a low APT Pin
-Priority.
+build-dependencies of a package.  There are two alternate implementations, the
+"experimental" implementation, "pbuilder-satisfydepends-experimental", which
+might be useful to pull packages from experimental or from repositories with a
+low APT Pin Priority, and the "aptitude" implementation, which will resolve
+build-dependencies and build-conflicts with aptitude which helps dealing with
+complex cases but does not support unsigned APT repositories
 
 .TP
 .BI "BUILDUSERID=" "1234"
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index bd99ffa..b0625af 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Mar 31 12:25:03 JST 2007
-pbuilder-time-stamp: 1175311503
+Current time: Sun Apr  1 12:26:34 JST 2007
+pbuilder-time-stamp: 1175397994
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -44,7 +44,7 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3483kB in 8s (434kB/s)
+Fetched 3483kB in 6s (544kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
@@ -90,16 +90,16 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (370kB/s)
+Fetched 97.4kB in 0s (330kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12703 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: can't open `/gnupg/options.skel': No such file or directory
@@ -414,8 +414,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -423,11 +423,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Mar 31 03:25:47 UTC 2007
+Sun Apr  1 03:27:37 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
@@ -497,14 +497,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 Mar 31 03:25:52 UTC 2007
+Sun Apr  1 03:27:42 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+b: b
 c: c
 dsh: Process terminated (before write).
 a: a
-b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -609,7 +609,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Mar 31 12:25:55 JST 2007
-pbuilder-time-stamp: 1175311555
+Current time: Sun Apr  1 12:27:47 JST 2007
+pbuilder-time-stamp: 1175398067
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/14103 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/9789 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index fa9dddc..748759f 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Mar 31 12:17:15 JST 2007
-pbuilder-time-stamp: 1175311035
+Current time: Sun Apr  1 12:17:59 JST 2007
+pbuilder-time-stamp: 1175397479
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -44,7 +44,7 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3534kB in 6s (558kB/s)
+Fetched 3534kB in 4s (820kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12040 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-3_amd64.deb) ...
@@ -90,16 +90,16 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (204kB/s)
+Fetched 103kB in 0s (190kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12712 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
 Setting up fakeroot (1.6.5) ...
 
 Copying source file
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: can't open `/gnupg/options.skel': No such file or directory
@@ -423,11 +423,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 Mar 31 03:18:13 UTC 2007
+Sun Apr  1 03:19:11 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
@@ -497,12 +497,12 @@ 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 Mar 31 03:18:18 UTC 2007
+Sun Apr  1 03:19:16 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
 a: a
+b: b
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -608,7 +608,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Mar 31 12:18:21 JST 2007
-pbuilder-time-stamp: 1175311101
+Current time: Sun Apr  1 12:19:19 JST 2007
+pbuilder-time-stamp: 1175397559
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/10284 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/5566 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index 77a497c..026ac82 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -1028,7 +1028,6 @@ O: Get:2 bootstrap: . Release [74.4kB]
 O: Reading package lists...
 O: 
 O: Reading package lists...
-O: 
 O: Building dependency tree...
 O: 
 O: Suggested packages:
@@ -1361,7 +1360,7 @@ umount: /proc/bus/usb: not found
 umount: /dev/shm: not mounted
 umount: /proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//28009/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//23392/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -1370,7 +1369,7 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org etch Release [74.4kB]
 Get:3 http://ftp.jp.debian.org etch/main Packages [5552kB]
-Fetched 5626kB in 3s (1723kB/s)
+Fetched 5626kB in 2s (1945kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -1414,7 +1413,7 @@ Get:14 http://ftp.jp.debian.org etch/main g++ 4:4.1.1-15 [1358B]
 Get:15 http://ftp.jp.debian.org etch/main make 3.81-2 [390kB]
 Get:16 http://ftp.jp.debian.org etch/main dpkg-dev 1.13.25 [166kB]
 Get:17 http://ftp.jp.debian.org etch/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 22s (945kB/s)
+Fetched 21.2MB in 25s (833kB/s)
 Selecting previously deselected package patch.
 (Reading database ... 7112 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
@@ -1480,9 +1479,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//28009/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//23392/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28009 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23392 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index 6aa46bd..1963194 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -1018,8 +1018,7 @@ O:              unchanged: 3
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 
-O: 5221 files and directories currently installed.)
+O: (Reading database ... 5221 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 O: Get:1 bootstrap: . Release.gpg [189B]
@@ -1357,7 +1356,7 @@ umount: /proc/bus/usb: not found
 umount: /dev/shm: not mounted
 umount: /proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//24097/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//19278/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -1366,7 +1365,7 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [79.6kB]
 Get:3 http://ftp.jp.debian.org sid/main Packages [5963kB]
-Fetched 6042kB in 3s (1792kB/s)
+Fetched 6043kB in 3s (1559kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -1409,7 +1408,7 @@ Get:14 http://ftp.jp.debian.org sid/main g++ 4:4.1.1-15 [1358B]
 Get:15 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
 Get:16 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.25 [166kB]
 Get:17 http://ftp.jp.debian.org sid/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 24s (851kB/s)
+Fetched 21.2MB in 20s (1013kB/s)
 Selecting previously deselected package patch.
 (Reading database ... 7119 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
@@ -1475,9 +1474,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//24097/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//19278/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24097 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19278 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index a12739b..0a6dcbe 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-etch.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31720 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//27410 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index 812efb3..28c9786 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sid.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//27950 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23330 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 1468189..7b160d6 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
   -> Installing apt-lines
@@ -15,8 +15,8 @@ Get:2 http://ftp.jp.debian.org experimental Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org experimental Release [79.6kB]
 Get:4 http://ftp.jp.debian.org sid/main Packages/DiffIndex [2038B]
-Get:5 http://ftp.jp.debian.org experimental/main Packages [707kB]
-Fetched 789kB in 1s (474kB/s)
+Get:5 http://ftp.jp.debian.org experimental/main Packages [709kB]
+Fetched 791kB in 2s (273kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -57,7 +57,7 @@ Get:22 http://ftp.jp.debian.org experimental/main cpp 4:4.1.2-1 [11.8kB]
 Get:23 http://ftp.jp.debian.org experimental/main gcc 4:4.1.2-1 [5048B]
 Get:24 http://ftp.jp.debian.org experimental/main g++ 4:4.1.2-1 [1346B]
 Preconfiguring packages ...
-Fetched 25.0MB in 33s (752kB/s)
+Fetched 25.0MB in 48s (516kB/s)
 (Reading database ... 12040 files and directories currently installed.)
 Removing tasksel ...
 Removing tasksel-data ...
@@ -184,9 +184,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//32476/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//28208/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//32476 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//28208 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index bd469c1..6a2fd81 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
   -> Installing apt-lines
@@ -12,7 +12,7 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [79.6kB]
 Get:3 http://ftp.jp.debian.org sid/main Packages [5963kB]
-Fetched 6042kB in 8s (715kB/s)
+Fetched 6043kB in 10s (562kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -51,7 +51,7 @@ Get:23 http://ftp.jp.debian.org sid/main vim-common 1:7.0-219+1 [185kB]
 Get:24 http://ftp.jp.debian.org sid/main libdevmapper1.02 2:1.02.12-1 [42.0kB]
 Get:25 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
 Preconfiguring packages ...
-Fetched 5389kB in 15s (343kB/s)
+Fetched 5389kB in 16s (324kB/s)
 (Reading database ... 12033 files and directories currently installed.)
 Preparing to replace debianutils 2.17 (using .../debianutils_2.18_amd64.deb) ...
 Unpacking replacement debianutils ...
@@ -91,8 +91,8 @@ Preparing to replace tzdata 2007b-1 (using .../tzdata_2007d-1_all.deb) ...
 Unpacking replacement tzdata ...
 Setting up tzdata (2007d-1) ...
 Current default timezone: 'UTC'.
-Local time is now:      Sat Mar 31 03:28:42 UTC 2007.
-Universal Time is now:  Sat Mar 31 03:28:42 UTC 2007.
+Local time is now:      Sun Apr  1 03:31:36 UTC 2007.
+Universal Time is now:  Sun Apr  1 03:31:36 UTC 2007.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 12039 files and directories currently installed.)
@@ -174,9 +174,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//31779/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//27474/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31779 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//27474 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index 9e99086..1a2199f 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2
+-> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2
  -> policy-rc.d already exists
 Using: $
 Reading package lists...
@@ -26,7 +26,7 @@ Get:1 http://ftp.jp.debian.org etch/main libdebian-installer4 0.50 [27.3kB]
 Get:2 http://ftp.jp.debian.org etch/main libdebian-installer-extra4 0.50 [10.5kB]
 Get:3 http://ftp.jp.debian.org etch/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://ftp.jp.debian.org etch/main pbuilder 0.161 [82.6kB]
-Fetched 147kB in 1s (141kB/s)
+Fetched 147kB in 2s (64.3kB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.50_amd64.deb) ...
@@ -74,7 +74,7 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3483kB in 1s (2332kB/s)
+Fetched 3483kB in 1s (2539kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12127 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
@@ -120,7 +120,7 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (768kB/s)
+Fetched 97.4kB in 0s (212kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12797 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
@@ -136,14 +136,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -338,18 +338,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -362,26 +362,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/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -432,7 +432,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 Mar 31 03:27:41 UTC 2007
+Sun Apr  1 03:29:59 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
@@ -502,7 +502,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 Mar 31 03:27:46 UTC 2007
+Sun Apr  1 03:30:04 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -517,9 +517,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -527,58 +527,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/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -599,8 +599,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2 filesystem
+ -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir3/25926 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/21615 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index 93941e3..160af4c 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2
+-> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2
  -> policy-rc.d already exists
 Using: $
 Reading package lists...
@@ -26,7 +26,7 @@ Get:1 http://ftp.jp.debian.org sid/main libdebian-installer4 0.50 [27.3kB]
 Get:2 http://ftp.jp.debian.org sid/main libdebian-installer-extra4 0.50 [10.5kB]
 Get:3 http://ftp.jp.debian.org sid/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://ftp.jp.debian.org sid/main pbuilder 0.165 [84.2kB]
-Fetched 149kB in 2s (60.6kB/s)
+Fetched 149kB in 2s (59.6kB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 12040 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.50_amd64.deb) ...
@@ -74,7 +74,7 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3534kB in 1s (2299kB/s)
+Fetched 3534kB in 1s (2561kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12134 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-3_amd64.deb) ...
@@ -120,7 +120,7 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (553kB/s)
+Fetched 103kB in 0s (651kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12806 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
@@ -136,14 +136,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -338,18 +338,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -362,26 +362,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/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -393,7 +393,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
@@ -432,7 +431,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 Mar 31 03:20:37 UTC 2007
+Sun Apr  1 03:21:42 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
@@ -502,14 +501,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 Mar 31 03:20:42 UTC 2007
+Sun Apr  1 03:21:47 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).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -518,9 +516,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -528,58 +526,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/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -600,8 +598,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2 filesystem
+ -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir3/22147 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/17532 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index b80ec53..cf24a0e 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-etch.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,10 +31,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Mar 31 12:26:00 JST 2007
-pbuilder-time-stamp: 1175311560
+Current time: Sun Apr  1 12:27:54 JST 2007
+pbuilder-time-stamp: 1175398074
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -73,7 +73,7 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3483kB in 1s (2257kB/s)
+Fetched 3483kB in 5s (621kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
@@ -119,7 +119,7 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (768kB/s)
+Fetched 97.4kB in 0s (940kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12703 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
@@ -457,7 +457,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 Mar 31 03:26:48 UTC 2007
+Sun Apr  1 03:28:51 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
@@ -527,13 +527,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 Mar 31 03:26:53 UTC 2007
+Sun Apr  1 03:28:56 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-c: c
 b: b
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -638,7 +638,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Mar 31 12:26:55 JST 2007
-pbuilder-time-stamp: 1175311615
+Current time: Sun Apr  1 12:28:58 JST 2007
+pbuilder-time-stamp: 1175398138
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir3/20130 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/15818 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index 3c5fd29..fcdb8ca 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sid.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,10 +31,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Mar 31 12:18:39 JST 2007
-pbuilder-time-stamp: 1175311119
+Current time: Sun Apr  1 12:19:27 JST 2007
+pbuilder-time-stamp: 1175397567
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -73,7 +73,7 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3534kB in 1s (2261kB/s)
+Fetched 3534kB in 1s (2324kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12040 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-3_amd64.deb) ...
@@ -119,7 +119,7 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (679kB/s)
+Fetched 103kB in 0s (1103kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12712 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
@@ -457,7 +457,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 Mar 31 03:19:35 UTC 2007
+Sun Apr  1 03:20:29 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
@@ -527,12 +527,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 Mar 31 03:19:40 UTC 2007
+Sun Apr  1 03:20:34 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).
+a: a
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -638,7 +639,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Mar 31 12:19:42 JST 2007
-pbuilder-time-stamp: 1175311182
+Current time: Sun Apr  1 12:20:40 JST 2007
+pbuilder-time-stamp: 1175397640
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir3/16326 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/11736 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 4d9f159..8f17bfe 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Mar 31 12:08:32 JST 2007
-pbuilder-time-stamp: 1175310512
+Current time: Sun Apr  1 12:09:03 JST 2007
+pbuilder-time-stamp: 1175396943
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -44,7 +44,7 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3483kB in 2s (1614kB/s)
+Fetched 3483kB in 1s (1789kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
@@ -90,16 +90,16 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (411kB/s)
+Fetched 97.4kB in 0s (246kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12703 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: can't open `/gnupg/options.skel': No such file or directory
@@ -404,6 +404,9 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 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
+dsh: Failed executing ./invalid-exec-file with llexec call
+dsh: Failed executing ./invalid-exec-file with llexec call
 success
 success
 success
@@ -424,7 +427,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 Mar 31 03:09:14 UTC 2007
+Sun Apr  1 03:09:43 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
@@ -494,14 +497,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 Mar 31 03:09:19 UTC 2007
+Sun Apr  1 03:09:48 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).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -606,7 +608,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Mar 31 12:09:21 JST 2007
-pbuilder-time-stamp: 1175310561
+Current time: Sun Apr  1 12:09:50 JST 2007
+pbuilder-time-stamp: 1175396990
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/4401 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/32636 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index af952ab..953f66b 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Mar 31 12:02:42 JST 2007
-pbuilder-time-stamp: 1175310162
+Current time: Sun Apr  1 12:02:57 JST 2007
+pbuilder-time-stamp: 1175396577
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -44,7 +44,7 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3534kB in 3s (1026kB/s)
+Fetched 3534kB in 3s (1063kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12040 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-3_amd64.deb) ...
@@ -90,16 +90,16 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (611kB/s)
+Fetched 103kB in 0s (576kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12712 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
 Setting up fakeroot (1.6.5) ...
 
 Copying source file
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: can't open `/gnupg/options.skel': No such file or directory
@@ -413,8 +413,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
@@ -427,7 +427,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 Mar 31 03:03:40 UTC 2007
+Sun Apr  1 03:03:57 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
@@ -497,14 +497,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 Mar 31 03:03:45 UTC 2007
+Sun Apr  1 03:04:02 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
 a: a
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -609,7 +609,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Mar 31 12:03:48 JST 2007
-pbuilder-time-stamp: 1175310228
+Current time: Sun Apr  1 12:04:04 JST 2007
+pbuilder-time-stamp: 1175396644
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir1/6791 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/2694 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 0a24a29..a53987b 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -583,7 +583,7 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//24605/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//20502/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -592,7 +592,7 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
 Hit http://ftp.jp.debian.org etch Release
 Get:2 http://ftp.jp.debian.org etch/main Packages/DiffIndex [2038B]
-Fetched 2227B in 0s (4701B/s)
+Fetched 2227B in 0s (6622B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -636,7 +636,7 @@ Get:14 http://ftp.jp.debian.org etch/main g++ 4:4.1.1-15 [1358B]
 Get:15 http://ftp.jp.debian.org etch/main make 3.81-2 [390kB]
 Get:16 http://ftp.jp.debian.org etch/main dpkg-dev 1.13.25 [166kB]
 Get:17 http://ftp.jp.debian.org etch/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 16s (1282kB/s)
+Fetched 21.2MB in 14s (1440kB/s)
 Selecting previously deselected package patch.
 (Reading database ... 7112 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
@@ -702,9 +702,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//24605/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//20502/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24605 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//20502 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index beab899..94885a9 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -583,7 +583,7 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//27197/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//23015/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -592,7 +592,7 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Get:2 http://ftp.jp.debian.org sid/main Packages/DiffIndex [2038B]
-Fetched 2227B in 0s (7587B/s)
+Fetched 2227B in 0s (7808B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -635,7 +635,7 @@ Get:14 http://ftp.jp.debian.org sid/main g++ 4:4.1.1-15 [1358B]
 Get:15 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
 Get:16 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.25 [166kB]
 Get:17 http://ftp.jp.debian.org sid/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 14s (1471kB/s)
+Fetched 21.2MB in 13s (1518kB/s)
 Selecting previously deselected package patch.
 (Reading database ... 7119 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
@@ -701,9 +701,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//27197/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//23015/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//27197 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23015 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 45082aa..9e6d0e7 100644
--- a/testsuite/normal/pbuilder-execute-etch.log
+++ b/testsuite/normal/pbuilder-execute-etch.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22746 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//17916 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index 7445a81..94796f5 100644
--- a/testsuite/normal/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24545 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//20442 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index ed8ab44..1cd827a 100644
--- a/testsuite/normal/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
   -> Installing apt-lines
@@ -15,8 +15,8 @@ Get:2 http://ftp.jp.debian.org experimental Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org experimental Release [79.6kB]
 Get:4 http://ftp.jp.debian.org sid/main Packages/DiffIndex [2038B]
-Get:5 http://ftp.jp.debian.org experimental/main Packages [707kB]
-Fetched 789kB in 1s (526kB/s)
+Get:5 http://ftp.jp.debian.org experimental/main Packages [709kB]
+Fetched 791kB in 2s (374kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -57,7 +57,7 @@ Get:22 http://ftp.jp.debian.org experimental/main cpp 4:4.1.2-1 [11.8kB]
 Get:23 http://ftp.jp.debian.org experimental/main gcc 4:4.1.2-1 [5048B]
 Get:24 http://ftp.jp.debian.org experimental/main g++ 4:4.1.2-1 [1346B]
 Preconfiguring packages ...
-Fetched 25.0MB in 31s (803kB/s)
+Fetched 25.0MB in 39s (635kB/s)
 (Reading database ... 12040 files and directories currently installed.)
 Removing tasksel ...
 Removing tasksel-data ...
@@ -184,9 +184,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//23496/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//18667/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23496 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//18667 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 48adbbc..41920a3 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
   -> Installing apt-lines
@@ -12,7 +12,7 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [79.6kB]
 Get:3 http://ftp.jp.debian.org sid/main Packages [5963kB]
-Fetched 6042kB in 5s (1187kB/s)
+Fetched 6043kB in 6s (912kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -51,7 +51,7 @@ Get:23 http://ftp.jp.debian.org sid/main vim-common 1:7.0-219+1 [185kB]
 Get:24 http://ftp.jp.debian.org sid/main libdevmapper1.02 2:1.02.12-1 [42.0kB]
 Get:25 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
 Preconfiguring packages ...
-Fetched 5389kB in 10s (531kB/s)
+Fetched 5389kB in 7s (683kB/s)
 (Reading database ... 12033 files and directories currently installed.)
 Preparing to replace debianutils 2.17 (using .../debianutils_2.18_amd64.deb) ...
 Unpacking replacement debianutils ...
@@ -171,9 +171,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//22802/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//17974/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22802 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//17974 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 0277c37..76e1302 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2
+-> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2
  -> policy-rc.d already exists
 Using: $
 Reading package lists...
@@ -26,7 +26,7 @@ Get:1 http://ftp.jp.debian.org etch/main libdebian-installer4 0.50 [27.3kB]
 Get:2 http://ftp.jp.debian.org etch/main libdebian-installer-extra4 0.50 [10.5kB]
 Get:3 http://ftp.jp.debian.org etch/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://ftp.jp.debian.org etch/main pbuilder 0.161 [82.6kB]
-Fetched 147kB in 1s (131kB/s)
+Fetched 147kB in 0s (168kB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.50_amd64.deb) ...
@@ -74,7 +74,7 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3483kB in 1s (2195kB/s)
+Fetched 3483kB in 1s (2542kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12127 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
@@ -120,7 +120,7 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (1050kB/s)
+Fetched 97.4kB in 0s (960kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12797 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
@@ -136,14 +136,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -338,18 +338,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -362,26 +362,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/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -432,7 +432,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 Mar 31 03:10:51 UTC 2007
+Sun Apr  1 03:11:38 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
@@ -502,13 +502,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 Mar 31 03:10:57 UTC 2007
+Sun Apr  1 03:11:43 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-c: c
 b: b
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -517,9 +517,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -527,58 +527,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/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -599,8 +599,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2 filesystem
+ -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir3/16961 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/12131 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 05241d8..819d08a 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2
+-> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2
  -> policy-rc.d already exists
 Using: $
 Reading package lists...
@@ -26,7 +26,7 @@ Get:1 http://ftp.jp.debian.org sid/main libdebian-installer4 0.50 [27.3kB]
 Get:2 http://ftp.jp.debian.org sid/main libdebian-installer-extra4 0.50 [10.5kB]
 Get:3 http://ftp.jp.debian.org sid/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://ftp.jp.debian.org sid/main pbuilder 0.165 [84.2kB]
-Fetched 149kB in 0s (238kB/s)
+Fetched 149kB in 0s (212kB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 12040 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.50_amd64.deb) ...
@@ -74,7 +74,7 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3534kB in 1s (2152kB/s)
+Fetched 3534kB in 1s (2556kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12134 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-3_amd64.deb) ...
@@ -120,7 +120,7 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (992kB/s)
+Fetched 103kB in 0s (990kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12806 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
@@ -136,14 +136,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -338,18 +338,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -362,26 +362,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/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -432,7 +432,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 Mar 31 03:05:36 UTC 2007
+Sun Apr  1 03:06: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
@@ -502,14 +502,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 Mar 31 03:05:41 UTC 2007
+Sun Apr  1 03:06:05 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
+a: a
 c: c
-dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -518,9 +517,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -528,58 +527,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/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -600,8 +599,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2 filesystem
+ -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir3/18755 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/14653 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 5b1d31c..d3ed30f 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,10 +31,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Mar 31 12:09:24 JST 2007
-pbuilder-time-stamp: 1175310564
+Current time: Sun Apr  1 12:09:53 JST 2007
+pbuilder-time-stamp: 1175396993
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -73,7 +73,7 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3483kB in 1s (2455kB/s)
+Fetched 3483kB in 1s (2539kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
@@ -119,7 +119,7 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (1061kB/s)
+Fetched 97.4kB in 0s (1062kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12703 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
@@ -457,7 +457,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 Mar 31 03:10:03 UTC 2007
+Sun Apr  1 03:10:40 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
@@ -527,14 +527,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 Mar 31 03:10:08 UTC 2007
+Sun Apr  1 03:10:45 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).
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -639,7 +638,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Mar 31 12:10:10 JST 2007
-pbuilder-time-stamp: 1175310610
+Current time: Sun Apr  1 12:10:47 JST 2007
+pbuilder-time-stamp: 1175397047
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir3/11162 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/6199 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index a3f5948..b3a395b 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,10 +31,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Mar 31 12:03:52 JST 2007
-pbuilder-time-stamp: 1175310232
+Current time: Sun Apr  1 12:04:09 JST 2007
+pbuilder-time-stamp: 1175396649
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -73,7 +73,7 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3534kB in 1s (2129kB/s)
+Fetched 3534kB in 1s (2547kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12040 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-3_amd64.deb) ...
@@ -119,7 +119,7 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (1109kB/s)
+Fetched 103kB in 0s (1116kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12712 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
@@ -457,7 +457,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 Mar 31 03:04:43 UTC 2007
+Sun Apr  1 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
@@ -527,7 +527,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 Mar 31 03:04:48 UTC 2007
+Sun Apr  1 03:05:05 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -638,7 +638,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Mar 31 12:04:50 JST 2007
-pbuilder-time-stamp: 1175310290
+Current time: Sun Apr  1 12:05:07 JST 2007
+pbuilder-time-stamp: 1175396707
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.iKIGW27192/dir3/12967 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/8812 and its subdirectories