diff options
| author | Junichi Uekawa <dancer@dancer64.netfort.gr.jp> | 2007-05-27 13:46:59 +0900 |
|---|---|---|
| committer | Junichi Uekawa <dancer@dancer64.netfort.gr.jp> | 2007-05-27 13:46:59 +0900 |
| commit | 70600059722511dcbcdae59a7f57f1fdff8a1f7c (patch) | |
| tree | 8281eb127612ddadeabb4b25bef90db01798569b /pbuilder-updatebuildenv | |
| parent | 7fbaa9928c327998c452c9500f8ae14c1ddfbd39 (diff) | |
| download | pbuilder-70600059722511dcbcdae59a7f57f1fdff8a1f7c.tar pbuilder-70600059722511dcbcdae59a7f57f1fdff8a1f7c.tar.gz | |
change "trap" handling so that all trap function calls are called _trap, and they will exit pbuilder after receiving a trap.
Diffstat (limited to 'pbuilder-updatebuildenv')
| -rwxr-xr-x | pbuilder-updatebuildenv | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index d6abe49..fb5bdfd 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -32,7 +32,7 @@ else fi extractbuildplace -$TRAP umountproc_cleanbuildplace exit sighup +$TRAP umountproc_cleanbuildplace_trap exit sighup loadhooks echo "Refreshing the base.tgz " @@ -43,7 +43,7 @@ if [ -n "$REMOVEPACKAGES" ]; then fi recover_aptcache -$TRAP saveaptcache_umountproc_cleanbuildplace exit sighup +$TRAP saveaptcache_umountproc_cleanbuildplace_trap exit sighup $CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade $CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES save_aptcache @@ -62,17 +62,21 @@ if [ "${AUTOCLEANAPTCACHE}" = "yes" -a -n "$APTCACHE" ]; then done fi -$TRAP umountproc_cleanbuildplace exit sighup +$TRAP umountproc_cleanbuildplace_trap exit sighup executehooks "E" unloadhooks umountproc $CHROOTEXEC /usr/bin/apt-get clean || true -$TRAP cleanbuildplace exit sighup +$TRAP cleanbuildplace_trap exit sighup if [ ! "${INTERNAL_BUILD_UML}" = "yes" ]; then create_basetgz fi if [ "${PRESERVE_BUILDPLACE}" = "yes" ]; then - trap exit sighup + : +else + cleanbuildplace fi +trap exit sighup +exit 0 |