+2006-03-18 Junichi Uekawa <dancer@debian.org>

+
+	* pbuilder.8: update documentation of --pkgname-logfile
+
+	* pbuilder-buildpackage: allow chown, and add support for PKGNAME_LOGFILE_EXTENTION.
+
+	* pbuilderrc (PKGNAME_LOGFILE_EXTENTION): add
+
+	* pbuilderrc.5: document
+

6 files changed, 44 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 745b1ae..62b51ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-18  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder.8: update documentation of --pkgname-logfile
+
+	* pbuilder-buildpackage: allow chown, and add support for PKGNAME_LOGFILE_EXTENTION.
+	
+	* pbuilderrc (PKGNAME_LOGFILE_EXTENTION): add
+
+	* pbuilderrc.5: document
+
 2006-03-17  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder-buildpackage (BUILDRESULTGID): chown/chgrp buildresult logfiles
diff --git a/debian/changelog b/debian/changelog
index 6f4403a..c072730 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 pbuilder (0.150) UNRELEASED; urgency=low
 
-  * build-log user/group is changed to buildresult permissions.
-
- -- Junichi Uekawa <dancer@debian.org>  Fri, 17 Mar 2006 09:14:16 +0900
+  * Bug fix: "pbuilder: Please add option to pdebuild to create .build
+    files automatically", thanks to Daniel Leidert (Closes: #341553).
+  * Bug fix: "[changes default behavior] Fix logfile name to have .log
+    appended if using --pkg-logfile", thanks to Christian Hammers
+    (Closes: #287477).
+    Note that the default is changed to '_{ARCH}.build' to match debuild.
+
+ -- Junichi Uekawa <dancer@debian.org>  Sat, 18 Mar 2006 07:14:09 +0900
 
 pbuilder (0.149) unstable; urgency=low
 
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 1c8d894..e186ec8 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -24,7 +24,6 @@ set -e
 . /usr/lib/pbuilder/pbuilder-runhooks
 . /usr/lib/pbuilder/pbuilder-buildpackage-funcs
 
-
 PACKAGENAME="$1"
 if [ ! -f "$PACKAGENAME" ]; then
     echo "Command line parameter [$PACKAGENAME] is not a valid .dsc file name" >&2
@@ -43,6 +42,11 @@ else
     BUILDUSERNAME=root
 fi
 
+
+# created files should have these UID/GIDs outside of chroot.
+BUILDRESULTUID="${BUILDRESULTUID:-${SUDO_UID:-0}}"
+BUILDRESULTGID="${BUILDRESULTGID:-${SUDO_GID:-0}}"
+
 export HOME="/tmp/buildd"
 
 showbuildbanner '$Id$'
@@ -58,7 +62,7 @@ fi
 
 if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then
     if [ "${USE_PKGNAME_LOGFILE}" = "yes" ]; then
-	PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)
+	PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)"${PKGNAME_LOGFILE_EXTENTION}"
 	exec > "${PBUILDER_BUILD_LOGFILE}"
 	exec 2>&1
 	PBUILDER_BUILD_LOGFILE=$(readlink -f "${PBUILDER_BUILD_LOGFILE}")
@@ -68,6 +72,13 @@ if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then
     fi
 fi
 
+# make logfile have the permissions, logfiles should already be created in all cases
+if [ -f "${PBUILDER_BUILD_LOGFILE}" ]; then
+    chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${PBUILDER_BUILD_LOGFILE}"
+    chgrp "${BUILDRESULTGID}" "${PBUILDER_BUILD_LOGFILE}"
+fi
+
+
 recover_aptcache
 echo "Installing the build-deps"
 executehooks "D"
@@ -138,9 +149,6 @@ 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}}"
 
 if [ -d "${BUILDRESULT}" ]; then
     chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/*
@@ -150,10 +158,4 @@ else
     echo "E: BUILDRESULT=[$BUILDRESULT] is not a directory." >&2
 fi
 
-# 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/pbuilder.8 b/pbuilder.8
index 9e4455b..218ecdc 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -365,7 +365,12 @@ option.
 Automatically creates a logfile that is named by the .dsc file name,
 only really applicable for 
 .B build
-target
+target.
+
+The file extention is specified by 
+.B "PKGNAME_LOGFILE_EXTENTION"
+in 
+.B "pbuilderrc"
 
 .TP
 .BI "\-\-aptconfdir [" "APT configuration directory to use" "]"
diff --git a/pbuilderrc b/pbuilderrc
index 5409e16..ba7eaa3 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -61,3 +61,6 @@ export SHELL=/bin/bash
 
 # The name of debootstrap command.
 DEBOOTSTRAP="cdebootstrap"
+
+# default file extention for pkgname-logfile
+PKGNAME_LOGFILE_EXTENTION="_$(dpkg --print-architecture).build"
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index ebdc8a4..15780a1 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -321,6 +321,10 @@ Known implementations of debootstrap are
 and
 .B "debootstrap"
 
+.TP
+.BI "PKGNAME_LOGFILE_EXTENTION=" ".build"
+The extention of filename used in pkgname-logfile option.
+
 .SH "AUTHOR"
 Initial coding, and main maintenance is done by 
 Junichi Uekawa <dancer@debian.org>.