diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | pbuilder-buildpackage-funcs | 4 | ||||
| -rwxr-xr-x | pbuilder-checkparams | 10 | ||||
| -rwxr-xr-x | pbuilder-createbuildenv | 2 | ||||
| -rwxr-xr-x | pbuilder-updatebuildenv | 2 | ||||
| -rw-r--r-- | pbuilder.8 | 10 |
8 files changed, 39 insertions, 9 deletions
@@ -1,5 +1,18 @@ 2003-12-16 Junichi Uekawa <dancer@debian.org> + * debian/control (Description): do not conflict with older bash. + + * pbuilder-buildpackage-funcs: + * pbuilder-checkparams: do not error out on + failure to unset. + + * pbuilder.8: document --debug. + + * pbuilder-checkparams (IGNORE_UMOUNT): --debug option. + + * pbuilder-createbuildenv: + * pbuilder-updatebuildenv: use PBUILDER_DEBUGMODE variable + * pbuilder-createbuildenv (DEBOOTSTRAPSCRIPT): use $TRAP instead of trap, and set TRAP to trap only when PRESERVE_BUILDPLACE is not yes. diff --git a/debian/changelog b/debian/changelog index 2450076..9595962 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,9 +10,11 @@ pbuilder (0.96) UNRELEASED; urgency=low * examples/execute_installtest.sh: Tries to 'apt-get install' a package and sees if it does install. * examples/execute_paramtest.sh: Just dumps the parameter. - TODO: umountproc is not called when error happens; that's not desirable. + * pbuilder --debug option added, to do some kind of debugging when + update and create. + * Do not conflict with older version of bash, and try to work with it. - -- Junichi Uekawa <dancer@debian.org> Tue, 16 Dec 2003 08:22:46 +0900 + -- Junichi Uekawa <dancer@debian.org> Tue, 16 Dec 2003 23:29:46 +0900 pbuilder (0.95) unstable; urgency=low diff --git a/debian/control b/debian/control index fc07e0b..737c46b 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Architecture: all Depends: debootstrap (>= 0.1.17.9), wget, gcc, debianutils (>= 1.13.1) Recommends: fakeroot, sudo, devscripts Suggests: pbuilder-uml -Conflicts: bash (<< 2.05b-1) Description: personal package builder for Debian packages pbuilder constructs a chroot system, and builds a package inside the chroot. diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index cac6321..668c0f9 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -78,8 +78,8 @@ function createbuilduser () { echo "$BUILDUSERNAME:x:$BUILDUSERID:$BUILDUSERID:,,,:/tmp/buildd:/bin/sh" >> $BUILDPLACE/etc/passwd echo "$BUILDUSERNAME:*:$BUILDUSERID:" >> $BUILDPLACE/etc/group echo "$BUILDUSERNAME:!:::::::" >> $BUILDPLACE/etc/shadow - unset LOGNAME + unset LOGNAME || true else - unset LOGNAME + unset LOGNAME || true fi } diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 96cdb1a..346e24d 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -28,7 +28,8 @@ BINARY_ARCH="no" PBUILDER_BUILD_LOGFILE= USE_PKGNAME_LOGFILE="" PRESERVE_BUILDPLACE="no" -unset EXTRA_CONFIGFILE +unset EXTRA_CONFIGFILE || true +PBUILDER_DEBUGMODE= #option for user-mode-linux only. IGNORE_UMOUNT="" @@ -173,6 +174,11 @@ while [ -n "$1" ]; do CHROOTEXEC="$2" shift; shift; ;; + --debug) + PBUILDER_DEBUGMODE=yes + set -x + shift; + ;; --no-targz) # specify this option if I am running in no-targz mode echo " -> Running in no-targz mode" @@ -225,7 +231,7 @@ case "$PBCURRENTCOMMANDLINEOPERATION" in FORCE_CONFNEW[0]='-o' FORCE_CONFNEW[1]='DPkg::Options::=--force-confnew' else - unset FORCE_CONFNEW + unset FORCE_CONFNEW || true fi ;; esac diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index 0a7b21e..dd0b8c0 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -28,7 +28,7 @@ if [ -z "$DISTRIBUTION" ]; then fi echo "Distribution is $DISTRIBUTION." -if [ "${PRESERVE_BUILDPLACE}" = "yes" ]; then +if [ "${PBUILDER_DEBUGMODE}" = "yes" ]; then TRAP="echo ignoring trap " else TRAP=trap diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index aa9153c..6fcf198 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -25,7 +25,7 @@ set -e if [ -n "$DISTRIBUTION" ]; then echo "Upgrading for distribution $DISTRIBUTION" fi -if [ "${PRESERVE_BUILDPLACE}" = "yes" ]; then +if [ "${PBUILDER_DEBUGMODE}" = "yes" ]; then TRAP="echo ignoring trap " else TRAP=trap @@ -398,6 +398,16 @@ Bind-mount the specified directories to inside the chroot. .I "bind-mount-points" is a space-delimited list of directories to bind-mount. +.TP +.BI "--debug" + +Turn on Debug mode of pbuilder, to be verbose about errors, +and try to avoid cleanup processing when error happens in +.B update + and +.B create +targets. + .SH "FILES" .TP .I "/etc/pbuilderrc" |