diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | THANKS | 5 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | pbuilder-checkparams | 14 | ||||
| -rw-r--r-- | pbuilder.8 | 4 |
5 files changed, 30 insertions, 7 deletions
@@ -1,5 +1,14 @@ 2002-09-22 Junichi Uekawa <dancer@debian.org> + * THANKS: updated thanks file. + + * pbuilder.8: update documentation, to clarify a bit. + + * pbuilder-checkparams (BUILDPLACE): Change command-line parsing + so that it should fix problems with specifying configfile. + (BUILDPLACE): only set CHROOTEXEC if it is empty. + set CHROOTEXEC to be empty at the start of param checking. + * pbuilder-createbuildenv: use pbuilder-modules code for copying etc/ files. @@ -9,5 +9,10 @@ jbouse@debian.org Mark Brown kov@debian.org Daniel Kobras +David Schleef <ds@schleef.org> +Eric Van Buggenhaut <Eric.VanBuggenhaut@AdValvas.be> + + +I thank them all! diff --git a/debian/changelog b/debian/changelog index 071d81a..8a0f8e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,10 @@ pbuilder (0.39) unstable; urgency=low * NOT YET RELEASED * Fix dereferencing of symlink code in pbuilder create - thanks: Eric Van Buggenhaut <Eric.VanBuggenhaut@AdValvas.be + thanks: Eric Van Buggenhaut <Eric.VanBuggenhaut@AdValvas.be> + * Fix handling of --configfile option, so that they are handled + similar to command-line options and other config files. + thanks: David Schleef <ds@schleef.org>(closes: #161856) -- Junichi Uekawa <dancer@debian.org> Sun, 22 Sep 2002 15:45:36 +0900 diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 2068291..9289af9 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -18,15 +18,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA . /usr/lib/pbuilder/pbuilder-loadconfig - . /usr/lib/pbuilder/pbuilder-modules -# the default is to add a PID in the buildplace specified in the config file. -BASEBUILDPLACE="$BUILDPLACE" -BUILDPLACE="$BUILDPLACE/$$" -CHROOTEXEC="chroot $BUILDPLACE " #default value for this option is !empty! INTERNAL_BUILD_UML="" +CHROOTEXEC="" while [ -n "$1" ]; do case "$1" in @@ -36,7 +32,6 @@ while [ -n "$1" ]; do ;; --buildplace) BUILDPLACE=$(readlink -f "$2"); - CHROOTEXEC="chroot $BUILDPLACE " shift; shift; ;; --mirror) @@ -139,6 +134,13 @@ done BUILDPLACE=${BUILDPLACE?"Build root directory is not defined"} +# the default is to add a PID in the buildplace specified in the config file. +BASEBUILDPLACE="$BUILDPLACE" +BUILDPLACE="$BUILDPLACE/$$" +if [ -z "${CHROOTEXEC}" ]; then + CHROOTEXEC="chroot $BUILDPLACE " +fi + case "$PBCURRENTCOMMANDLINEOPERATION" in login) # don't do anything if it is "login" @@ -83,6 +83,10 @@ Specifies the location where building and .B "base.tgz" updating and creation takes place. This is a temporary work directory. + +A subdirectory of that directory using the current PID of the +process is used. + .TP .BI "--buildresult [" "location to put build result" "]" Specifies the location the build result gets into after building. |