aboutsummaryrefslogtreecommitdiff
path: root/pbuilder-buildpackage
diff options
context:
space:
mode:
authordancer <dancer>2002-12-12 09:30:48 +0000
committerdancer <dancer>2002-12-12 09:30:48 +0000
commit691e978bfb9e1d8498b82acc319bb18f57c3d532 (patch)
treef54fc2e1e5ac8aac493031b85b23eda944eafdd2 /pbuilder-buildpackage
parent338d228d31541bdc2cdb0db373d21ee52e137607 (diff)
downloadpbuilder-691e978bfb9e1d8498b82acc319bb18f57c3d532.tar
pbuilder-691e978bfb9e1d8498b82acc319bb18f57c3d532.tar.gz
+ * pbuilder-buildpackage (PACKAGENAME): add banner for logfile.
+ + * debian/control (Recommends): add devscripts to recommends + + * pbuilder-checkparams (USE_PKGNAME_LOGFILE): fix typo + + * pbuilder-modules (pbuilder-options): add reference to pkgname-logfile to help text. + + * pbuilder.8: documentation of pkgname-logfile moved closer to --logfile option. + + * ChangeLog: spell-checked. + + * pbuilder.8: document --pkgname-logfile option. + From Michael Banck <mbanck@gmx.net>, requested feature. + * pbuilder-checkparams (PBUILDER_BUILD_LOGFILE): logfile name is stored in PBUILDER_BUILD_LOGFILE + (PBUILDER_BUILD_LOGFILE): add --pkgname-logfile option for using logfile with pkgname-version.log + (USE_PKGNAME_LOGFILE): make this variable be usable only as command-line option, and not for + configuration.
Diffstat (limited to 'pbuilder-buildpackage')
-rwxr-xr-xpbuilder-buildpackage18
1 files changed, 14 insertions, 4 deletions
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 0ed9a4d..d1d1089 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -20,7 +20,6 @@ export LANG=C
export LC_ALL=C
set -e
-
. /usr/lib/pbuilder/pbuilder-checkparams
. /usr/lib/pbuilder/pbuilder-runhooks
. /usr/lib/pbuilder/pbuilder-buildpackage-funcs
@@ -46,18 +45,29 @@ fi
export HOME="/tmp/buildd"
-showbuildbanner '$Id'
+showbuildbanner '$Id$'
echobacktime
extractbuildplace
trap umountproc_cleanbuildplace exit
loadhooks
createbuilduser
-echo Copying source file
+if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then
+ if [ "${USE_PKGNAME_LOGFILE}" = "yes" ]; then
+ PBUILDER_BUILD_LOGFILE=$(readlink -f "${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc).log)
+ exec > "${PBUILDER_BUILD_LOGFILE}"
+ exec 2>&1
+ echo "I: Using pkgname logfile"
+ showbuildbanner '$Id$'
+ echobacktime
+ fi
+fi
+
+echo "Copying source file"
copydsc "$PACKAGENAME" "$BUILDPLACE/tmp/buildd"
executehooks "D"
-echo Extracting source
+echo "Extracting source"
if ! $CHROOTEXEC /bin/bash -c "( cd tmp/buildd; chown $BUILDUSERNAME:$BUILDUSERNAME ../buildd *; $SUTOUSER /usr/bin/dpkg-source -x $(basename $PACKAGENAME) )"; then
echo "pbuilder: Failed extracting the source" >&2
exit 1;