[Pbuilder-maint] pbuilder CVS update: pbuilder
pbuilder-buildpackage ChangeLog
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Fri Jan 6 12:20:10 UTC 2006
User: dancer
Date: 06/01/06 12:20:10
Modified: . pbuilder-buildpackage ChangeLog
Log:
344958
Revision Changes Path
1.119 +6 -8 pbuilder/pbuilder-buildpackage
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage?annotate=1.119&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage?rev=1.119&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage.diff?r1=1.119&r2=1.118&cvsroot=
-----------------------------------
Index: pbuilder-buildpackage
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-buildpackage,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- pbuilder-buildpackage 21 Dec 2005 11:57:29 -0000 1.118
+++ pbuilder-buildpackage 6 Jan 2006 12:20:09 -0000 1.119
@@ -139,12 +139,10 @@
umountproc
if [ -d "${BUILDRESULT}" ]; then
- if [ -n "${BUILDRESULTUID}" ]; then
- chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/*
- fi
- if [ -n "${BUILDRESULTGID}" ]; then
- chgrp "${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/*
- fi
+ BUILDRESULTUID="${BUILDRESULTUID:-${SUDO_UID:-0}}"
+ chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/*
+ BUILDRESULTGID="${BUILDRESULTGID:-${SUDO_GID:-0}}"
+ chgrp "${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/*
cp -p "${BUILDPLACE}"/tmp/buildd/* "${BUILDRESULT}" 2>/dev/null || true
else
echo "E: BUILDRESULT=[$BUILDRESULT] is not a directory." >&2
1.360 +4 -1 pbuilder/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.360&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.360&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog.diff?r1=1.360&r2=1.359&cvsroot=
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- ChangeLog 6 Jan 2006 12:12:34 -0000 1.359
+++ ChangeLog 6 Jan 2006 12:20:10 -0000 1.360
@@ -1,5 +1,8 @@
2006-01-06 Junichi Uekawa <dancer at debian.org>
+ * pbuilder-buildpackage (BUILDRESULTGID, BUILDRESULTUID): set
+ default values here.
+
* pbuilder-modules (pbuilder-options): --debootstrap= is not a
valid option, change to --debootstrap[space]
More information about the Pbuilder-maint
mailing list