diff options
| author | dancer <dancer> | 2005-12-04 05:03:24 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2005-12-04 05:03:24 +0000 |
| commit | 715cb236fde50ada081fde416e65551d8ac2082a (patch) | |
| tree | d8421d06b47ab5aaefab02436b57c7e24f1ebd2e | |
| parent | c083f6c7fc979dc0a9cb45e687e56360621d4cf5 (diff) | |
| download | pbuilder-715cb236fde50ada081fde416e65551d8ac2082a.tar pbuilder-715cb236fde50ada081fde416e65551d8ac2082a.tar.gz | |
* Bug fix: "pbuilder-buildpackage-funcs check for createbuilduser for
SUTOUSER is bogus", thanks to Brian Nelson (Closes: #338976).
* Bug fix: "--no-targz option creates tarball in pbuilder create",
thanks to Junichi Uekawa (Closes: #341916).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 1 | ||||
| -rw-r--r-- | pbuilder-buildpackage-funcs | 4 | ||||
| -rwxr-xr-x | pbuilder-createbuildenv | 5 |
5 files changed, 17 insertions, 6 deletions
@@ -1,11 +1,16 @@ 2005-12-04 Junichi Uekawa <dancer@debian.org> + * pbuilder-createbuildenv: implement --no-targz for pbuilder create. + + * pbuilder-buildpackage-funcs: #338976; SUTOUSER check is bogus. + Only add a user when there is a user to add. + * pdebuild-internal: use --allow-unauthenticated option rather than --force-yes to apt-get install * pbuilder-updatebuildenv: * pbuilder-satisfydepends: * pbuilder-createbuildenv: * pbuilder-buildpackage-funcs: - + * examples/execute_installtest.sh: --allow-unauthenticated option to apt-get install * examples/B92test-pkg: * examples/B91dpkg-i: diff --git a/debian/changelog b/debian/changelog index 6d1adb9..2b47c6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,12 @@ pbuilder (0.140) UNRELEASED; urgency=low --allow-unauthenticated option", thanks to qfunk (Closes: #340715). - fixed other scripts to use --allow-unauthenticated option rather than --force-yes. * debconf compatibility level 4 + * Bug fix: "pbuilder-buildpackage-funcs check for createbuilduser for + SUTOUSER is bogus", thanks to Brian Nelson (Closes: #338976). + * Bug fix: "--no-targz option creates tarball in pbuilder create", + thanks to Junichi Uekawa (Closes: #341916). - -- Junichi Uekawa <dancer@debian.org> Sun, 4 Dec 2005 13:33:51 +0900 + -- Junichi Uekawa <dancer@debian.org> Sun, 4 Dec 2005 14:00:27 +0900 pbuilder (0.139) unstable; urgency=low diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 027c954..db9dd9f 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -31,7 +31,6 @@ if [ ! -f "$PACKAGENAME" ]; then exit 1; fi; -# due to if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then SUTOUSER="su -p $BUILDUSERNAME" DEBBUILDOPTS="$DEBBUILDOPTS -rfakeroot" diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index 1446b21..d8fe0ba 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -80,8 +80,8 @@ function cowprotect () { } function createbuilduser () { - # create the build user - if [ -n "$SUTOUSER" ]; then + # create the build user, if it is necessary and specified. + if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/passwd; then cowprotect $BUILDPLACE/etc/passwd echo "$BUILDUSERNAME:x:$BUILDUSERID:$BUILDUSERID:,,,:/tmp/buildd:/bin/sh" >> $BUILDPLACE/etc/passwd diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index bc81e89..067c82c 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -95,7 +95,10 @@ unloadhooks umountproc $TRAP cleanbuildplace exit -create_basetgz +# Internal_build_uml is set when --no-targz is set, this code is actually never called from pbuilder-user-mode-linux +if [ ! "${INTERNAL_BUILD_UML}" = "yes" ]; then + create_basetgz +fi if [ "${PRESERVE_BUILDPLACE}" = "yes" ]; then trap exit fi |