+2005-08-07 Junichi Uekawa <dancer@debian.org>

+
+	* debian/control: allow cdebootstrap dependency.
+
+	* testsuite/run-test.sh: complicate the process by testing both
+	  cdebootstrap and debootstrap.
+
+	* pbuilder.8: document --debootstrap
+
+	* pbuilder-checkparams: --debootstrap
+
+	* pbuilder-modules: --debootstrap
+
+	* pbuilder-createbuildenv: unset DEBOOTSTRAPSCRIPT instead of setting
+	"". The number of parameter given to cdebootstrap changes.
+	since DEBOOTSTRAPSCRIPT are not supported by cdebootstrap,
+	Giving cdebootstrap this parameter caused it to fail.
+
+	* pbuilderrc.5: Document DEBOOTSTRAP
+
+	* pbuilderrc (DEBOOTSTRAP): new option.
+
+	* pbuilder-createbuildenv (DEBOOTSTRAPSCRIPT): call ${DEBOOTSTRAP} instead of calling debootstrap directly.
+

1 files changed, 49 insertions, 39 deletions

diff --git a/testsuite/normal/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index 78a96f0..bad5520 100644
--- a/testsuite/normal/pdebuild-normal-sarge.log
+++ b/testsuite/normal/pdebuild-normal-sarge.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/whole/pbuilder/testsuite/tmp.rJ4u0j/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.k8Hxv8/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/whole/pbuilder/testsuite/tmp.rJ4u0j/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.k8Hxv8/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/whole/pbuilder/testsuite/tmp.rJ4u0j/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.k8Hxv8/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/whole/pbuilder/testsuite/tmp.rJ4u0j/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.k8Hxv8/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -25,22 +25,20 @@ dpkg-source: building dsh in dsh_0.25.6-1.dsc
  dpkg-genchanges -S
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
-W: /home/dancer/.pbuilderrc does not exist
 I: using fakeroot in build.
-pbuilder-buildpackage/powerpc $Id$
+pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Thu Jul 14 06:17:45 JST 2005
-pbuilder-time-stamp: 1121289465
+Current time: Sun Aug  7 12:54:54 JST 2005
+pbuilder-time-stamp: 1123386894
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/whole/pbuilder/testsuite/tmp.rJ4u0j/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.k8Hxv8/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
-Obtaining the cached apt archive contents
 Installing the build-deps
  -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.19 2005/06/03 12:07:39 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
@@ -61,19 +59,30 @@ The following NEW packages will be installed:
   debconf-utils debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/2641kB of archives.
-After unpacking 8970kB of additional disk space will be used.
+Need to get 2591kB of archives.
+After unpacking 8679kB of additional disk space will be used.
+Get:1 http://ring.asahi-net.or.jp sarge/main libmagic1 4.12-1 [233kB]
+Get:2 http://ring.asahi-net.or.jp sarge/main file 4.12-1 [28.6kB]
+Get:3 http://ring.asahi-net.or.jp sarge/main debconf-utils 1.4.30.13 [33.0kB]
+Get:4 http://ring.asahi-net.or.jp sarge/main html2text 1.3.2a-2 [92.6kB]
+Get:5 http://ring.asahi-net.or.jp sarge/main gettext 0.14.4-2 [1718kB]
+Get:6 http://ring.asahi-net.or.jp sarge/main intltool-debian 0.30+20040213 [23.5kB]
+Get:7 http://ring.asahi-net.or.jp sarge/main po-debconf 0.8.23 [78.0kB]
+Get:8 http://ring.asahi-net.or.jp sarge/main debhelper 4.2.32 [362kB]
+Get:9 http://ring.asahi-net.or.jp sarge/main libdshconfig1 0.20.11-1 [10.7kB]
+Get:10 http://ring.asahi-net.or.jp sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
+Fetched 2591kB in 0s (4446kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 10865 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.12-1_powerpc.deb) ...
+(Reading database ... 11040 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../file_4.12-1_powerpc.deb) ...
+Unpacking file (from .../archives/file_4.12-1_i386.deb) ...
 Selecting previously deselected package debconf-utils.
 Unpacking debconf-utils (from .../debconf-utils_1.4.30.13_all.deb) ...
 Selecting previously deselected package html2text.
-Unpacking html2text (from .../html2text_1.3.2a-2_powerpc.deb) ...
+Unpacking html2text (from .../html2text_1.3.2a-2_i386.deb) ...
 Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.14.4-2_powerpc.deb) ...
+Unpacking gettext (from .../gettext_0.14.4-2_i386.deb) ...
 Selecting previously deselected package intltool-debian.
 Unpacking intltool-debian (from .../intltool-debian_0.30+20040213_all.deb) ...
 Selecting previously deselected package po-debconf.
@@ -81,9 +90,9 @@ Unpacking po-debconf (from .../po-debconf_0.8.23_all.deb) ...
 Selecting previously deselected package debhelper.
 Unpacking debhelper (from .../debhelper_4.2.32_all.deb) ...
 Selecting previously deselected package libdshconfig1.
-Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_powerpc.deb) ...
+Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_i386.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
-Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_powerpc.deb) ...
+Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_i386.deb) ...
 Setting up libmagic1 (4.12-1) ...
 
 Setting up file (4.12-1) ...
@@ -105,14 +114,15 @@ Building Dependency Tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/81.8kB of archives.
-After unpacking 315kB of additional disk space will be used.
+Need to get 70.5kB of archives.
+After unpacking 201kB of additional disk space will be used.
+Get:1 http://ring.asahi-net.or.jp sarge/main fakeroot 1.2.10 [70.5kB]
+Fetched 70.5kB in 0s (2028kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11407 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.2.10_powerpc.deb) ...
+(Reading database ... 11582 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.2.10_i386.deb) ...
 Setting up fakeroot (1.2.10) ...
 
-Copying back the cached apt archive contents
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -132,7 +142,7 @@ debian: warning: no utmp entry available and LOGNAME not defined; using uid of p
 dpkg-buildpackage: source maintainer is Junichi Uekawa <dancer@debian.org>
 dpkg-architecture: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-architecture: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
-dpkg-buildpackage: host architecture is powerpc
+dpkg-buildpackage: host architecture is i386
 dpkg-checkbuilddeps: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-architecture: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-architecture: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
@@ -197,8 +207,8 @@ checking how to run the C preprocessor... gcc -E
 checking for egrep... grep -E
 checking for ANSI C header files... yes
 checking for sys/wait.h that is POSIX.1 compatible... yes
-checking build system type... powerpc-unknown-linux-gnu
-checking host system type... powerpc-unknown-linux-gnu
+checking build system type... i686-pc-linux-gnu
+checking host system type... i686-pc-linux-gnu
 checking for a sed that does not truncate output... /bin/sed
 checking for ld used by gcc... /usr/bin/ld
 checking if the linker (/usr/bin/ld) is GNU ld... yes
@@ -377,9 +387,9 @@ make[2]: Entering directory `/tmp/buildd/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
 make[2]: Leaving directory `/tmp/buildd/dsh-0.25.6/po'
 make[2]: Entering directory `/tmp/buildd/dsh-0.25.6'
-sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 /usr/bin/make  dsh
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.6'
+make[3]: `dsh' is up to date.
 make[3]: Leaving directory `/tmp/buildd/dsh-0.25.6'
 /usr/bin/make  check-TESTS
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.6'
@@ -420,8 +430,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
@@ -429,11 +439,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
-Wed Jul 13 21:19:54 UTC 2005
+Sun Aug  7 03:55:27 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -503,14 +513,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
-Wed Jul 13 21:19:59 UTC 2005
+Sun Aug  7 03:55:32 UTC 2005
 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
@@ -605,7 +614,7 @@ debian: warning: no utmp entry available and LOGNAME not defined; using uid of p
 dpkg-architecture: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dh_md5sums
 dh_builddeb
-dpkg-deb: building package `dsh' in `../dsh_0.25.6-1_powerpc.deb'.
+dpkg-deb: building package `dsh' in `../dsh_0.25.6-1_i386.deb'.
  dpkg-genchanges
 dpkg-genchanges: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-architecture: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
@@ -613,10 +622,11 @@ dpkg-parsechangelog: warning: no utmp entry available and LOGNAME not defined; u
 debian: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
-Copying back the cached apt archive contents
+ -> Terminate timeout process
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu Jul 14 06:20:16 JST 2005
-pbuilder-time-stamp: 1121289616
+/usr/lib/pbuilder/pbuilder-buildpackage: line 152: 13492 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+Current time: Sun Aug  7 12:55:35 JST 2005
+pbuilder-time-stamp: 1123386935
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/whole/pbuilder/testsuite/tmp.rJ4u0j/dir2/9232 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.k8Hxv8/dir2/13189 and its subdirectories