aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xpbuilder-buildpackage4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4eacb93..36de326 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-24 Junichi Uekawa <dancer@debian.org>
+
+ * pbuilder-buildpackage (BUILD_PID): add error checking for "kill"
+
2002-08-20 Junichi Uekawa <dancer@debian.org>
* pbuilder-buildpackage (BUILD_PID): add better messages for
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index af5a49e..a04a5d5 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -133,10 +133,10 @@ if [ -n ${TIMEOUT_TIME} ]; then
(
: Timeout process
sleep "${TIMEOUT_TIME}";
- kill ${BUILD_PID}
+ kill ${BUILD_PID} || true
echo " -> Terminating build process due to timeout "
) & # timeout process
- KILL_WAIT_PID="kill $!; echo \" -> Terminate timeout process\"; "
+ KILL_WAIT_PID="kill $! || true; echo \" -> Terminate timeout process\"; "
else
KILL_WAIT_PID=""
fi