aboutsummaryrefslogtreecommitdiff
path: root/pbuilder-buildpackage
diff options
context:
space:
mode:
authordancer <dancer>2004-10-31 11:05:35 +0000
committerdancer <dancer>2004-10-31 11:05:35 +0000
commitd0e81d2fc7da900898cb9732bb92ce53e526ffba (patch)
treef1d751c39b2a9975f3bce508eb5d8c3f1d2010bf /pbuilder-buildpackage
parent98068b6f01921ac004e59303fa51bda1e22c06ac (diff)
downloadpbuilder-d0e81d2fc7da900898cb9732bb92ce53e526ffba.tar
pbuilder-d0e81d2fc7da900898cb9732bb92ce53e526ffba.tar.gz
+2004-10-31 Junichi Uekawa <dancer@debian.org>
+ + * Documentation/pbuilder-doc.xml (PBUILDER_UML_IMAGE): add notes on + BUILRESULTUID and SUDO interaction. + + * pbuilder-buildpackage (PACKAGENAME): move around buildresult dir creation before pkgname logfile creation. + + * pbuilder.8: add documentation for --save-after-login/exec option. + + * pbuilder: execute and login with --save-after-login/exec option. + + * pbuilder-user-mode-linux.1: add notes that uml-nocow is effective for exec and login. + + * pbuilder-uml-checkparams (UML_SAVE_AFTER_LOGIN): add UML_NOCOW for exec + + * pbuilder-checkparams (SAVE_AFTER_LOGIN): --save-after-login/exec command-option. + + * pdebuild-user-mode-linux.1: add notes that the option will override + pbuilder option. + + * pdebuild.1: add notes that the option will override pbuilder option + + * pdebuild-user-mode-linux: ditto. + + * pdebuild: override --debbbuildopts in pbuilder option when DEBBUILDOPTS is available and for non-internal mode. +
Diffstat (limited to 'pbuilder-buildpackage')
-rwxr-xr-xpbuilder-buildpackage26
1 files changed, 14 insertions, 12 deletions
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 905690b..b2c6b48 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -51,6 +51,11 @@ extractbuildplace
trap umountproc_cleanbuildplace exit
loadhooks
+if [ -n "${BUILDRESULT}" ]; then
+ echo " -> created buildresult dir :${BUILDRESULT}"
+ mkdir -p "${BUILDRESULT}"
+fi
+
if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then
if [ "${USE_PKGNAME_LOGFILE}" = "yes" ]; then
PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)
@@ -125,19 +130,16 @@ executehooks "B"
trap cleanbuildplace exit
umountproc
-if [ -n "${BUILDRESULT}" ]; then
- mkdir -p "${BUILDRESULT}"
- 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
- cp -p "${BUILDPLACE}"/tmp/buildd/* "${BUILDRESULT}" 2>/dev/null || true
- else
- echo "E: BUILDRESULT=[$BUILDRESULT] is not a directory." >&2
+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
+ cp -p "${BUILDPLACE}"/tmp/buildd/* "${BUILDRESULT}" 2>/dev/null || true
+else
+ echo "E: BUILDRESULT=[$BUILDRESULT] is not a directory." >&2
fi
echobacktime