diff options
| author | dancer <dancer> | 2003-12-16 00:31:14 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2003-12-16 00:31:14 +0000 |
| commit | 6fc4aa6416317f702d30e74c2df7ee1e32b0a60b (patch) | |
| tree | b166df9dd146d3a7d4151a7fd0ab7fcd5574a3b8 /pbuilder-updatebuildenv | |
| parent | 091894173cb71295ebd3464d8ade56974266f57b (diff) | |
| download | pbuilder-6fc4aa6416317f702d30e74c2df7ee1e32b0a60b.tar pbuilder-6fc4aa6416317f702d30e74c2df7ee1e32b0a60b.tar.gz | |
+ * 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.
Diffstat (limited to 'pbuilder-updatebuildenv')
| -rwxr-xr-x | pbuilder-updatebuildenv | 9 |
1 files changed, 7 insertions, 2 deletions
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 |