diff options
| author | dancer <dancer> | 2002-08-20 09:34:35 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2002-08-20 09:34:35 +0000 |
| commit | 54d64b08e1b3b36af4f86fd10377a2fb303150f3 (patch) | |
| tree | ff20082c66987d249bac159c6221591e676d115d | |
| parent | 1fe05610f6dd30d357c881342070db1f2ab02003 (diff) | |
| download | pbuilder-54d64b08e1b3b36af4f86fd10377a2fb303150f3.tar pbuilder-54d64b08e1b3b36af4f86fd10377a2fb303150f3.tar.gz | |
fix up minor processes.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | debian/docs | 1 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 13 |
3 files changed, 13 insertions, 6 deletions
@@ -1,5 +1,10 @@ 2002-08-20 Junichi Uekawa <dancer@debian.org> + * pbuilder-buildpackage (BUILD_PID): add better messages for + build-termination process. + + * debian/docs: add THANKS. + * pbuilder-modules: document --timeout option. * pbuilder.8: document --timeout option diff --git a/debian/docs b/debian/docs index 240c6cf..9eb0398 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,4 @@ README AUTHORS +THANKS debian/TODO diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 109a65b..a35691a 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -118,8 +118,6 @@ export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin" executehooks "A" - - if [ -z "$DEBEMAIL" ]; then DPKG_COMMANDLINE="cd tmp/buildd/*/; $SUTOUSER dpkg-buildpackage -us -uc $DEBBUILDOPTS" else @@ -129,20 +127,23 @@ fi ($CHROOTEXEC /bin/bash -c "${DPKG_COMMANDLINE}") & BUILD_PID=$! if [ -n ${TIMEOUT_TIME} ]; then - ( sleep "${TIMEOUT_TIME}"; kill ${BUILD_PID} )& # timeout process - KILL_WAIT_PID="kill $!" + ( + sleep "${TIMEOUT_TIME}"; + echo " --> Terminating build process " + kill ${BUILD_PID} ) & # timeout process + KILL_WAIT_PID="echo \" --> Terminate timeout process\"; kill $!" else KILL_WAIT_PID="" fi if ! wait ${BUILD_PID}; then - ${KILL_WAIT_PID} + eval ${KILL_WAIT_PID} echo "pbuilder: Failed autobuilding of package" >&2 executehooks "C" umountproc_cleanbuildplace exit 1; else - ${KILL_WAIT_PID} + eval ${KILL_WAIT_PID} # build was successful fi |