add support for chmod/chown of logfile, needs more work.

4 files changed, 13 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a28a342..745b1ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-17  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-buildpackage (BUILDRESULTGID): chown/chgrp buildresult logfiles
+
 2006-03-08  Junichi Uekawa  <dancer@debian.org>
 
 	* Documentation/pbuilder-doc.xml: apply necessary formatting edition.
diff --git a/debian/changelog b/debian/changelog
index c558dff..6f4403a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 pbuilder (0.150) UNRELEASED; urgency=low
 
-  * 
+  * build-log user/group is changed to buildresult permissions.
 
- -- Junichi Uekawa <dancer@debian.org>  Tue, 28 Feb 2006 08:46:18 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Fri, 17 Mar 2006 09:14:16 +0900
 
 pbuilder (0.149) unstable; urgency=low
 
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 82870e0..1c8d894 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -138,6 +138,7 @@ save_aptcache
 trap cleanbuildplace exit
 umountproc
 
+# FIXME: this should be included in pbuilder-checkparams, really.
 BUILDRESULTUID="${BUILDRESULTUID:-${SUDO_UID:-0}}"
 BUILDRESULTGID="${BUILDRESULTGID:-${SUDO_GID:-0}}"
 
@@ -149,5 +150,10 @@ else
     echo "E: BUILDRESULT=[$BUILDRESULT] is not a directory." >&2
 fi
 
-echobacktime
+# chown/chgrp -- FIXME: this should be higher up, doesn't chmod/chown on failure cases.
+if [ -f "${PBUILDER_BUILD_LOGFILE}" ]; then
+    chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${PBUILDER_BUILD_LOGFILE}"
+    chgrp "${BUILDRESULTGID}" "${PBUILDER_BUILD_LOGFILE}"
+fi
 
+echobacktime
diff --git a/pbuilderrc b/pbuilderrc
index c6116ec..5409e16 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -51,7 +51,6 @@ BINDMOUNTS=""
 
 # Set the debootstrap variant to 'buildd' type.
 # DEBOOTSTRAPOPTS[0]='--variant=buildd'
-# or work around bug in debootstrap 3.0.0 (314858)
 unset DEBOOTSTRAPOPTS
 
 # Set the PATH I am going to use inside pbuilder: default is "/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"