From 6fc4aa6416317f702d30e74c2df7ee1e32b0a60b Mon Sep 17 00:00:00 2001
From: dancer <dancer>
Date: Tue, 16 Dec 2003 00:31:14 +0000
Subject: +	* pbuilder-createbuildenv (DEBOOTSTRAPSCRIPT): use $TRAP
 instead of trap, +	and set TRAP to trap only when PRESERVE_BUILDPLACE is
 not yes. + +	* Makefile (install): install new examples. +	*
 atoron.procmailrc (DUMMY): add daisuke to family.

---
 pbuilder-updatebuildenv | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'pbuilder-updatebuildenv')

diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 2566459..aa9153c 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -25,9 +25,14 @@ set -e
 if [ -n "$DISTRIBUTION" ]; then
     echo "Upgrading for distribution $DISTRIBUTION" 
 fi
+if [ "${PRESERVE_BUILDPLACE}" = "yes" ]; then
+    TRAP="echo ignoring trap "
+else
+    TRAP=trap
+fi
 
 extractbuildplace
-trap umountproc_cleanbuildplace exit
+$TRAP umountproc_cleanbuildplace exit
 
 loadhooks
 echo "Refreshing the base.tgz "
@@ -47,7 +52,7 @@ executehooks "E"
 unloadhooks
 
 umountproc
-trap cleanbuildplace exit
+$TRAP cleanbuildplace exit
 if [ ! "${INTERNAL_BUILD_UML}" = "yes" ]; then
     create_basetgz
 fi
-- 
cgit v1.2.3