diff options
| -rwxr-xr-x | pbuilder | 8 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 2 | ||||
| -rwxr-xr-x | pbuilder-createbuildenv | 2 | ||||
| -rw-r--r-- | pbuilder-modules | 4 | ||||
| -rwxr-xr-x | pbuilder-updatebuildenv | 2 |
5 files changed, 11 insertions, 7 deletions
@@ -87,12 +87,12 @@ File extracted to: $BUILDPLACE ${CHROOTEXEC} /usr/bin/apt-get clean || true create_basetgz cleanbuildplace - trap exit sighup + trap - exit sighup exit 0 fi fi umountproc_cleanbuildplace - trap exit sighup + trap - exit sighup exit 0 ;; --execute|execute) @@ -136,12 +136,12 @@ File extracted to: $BUILDPLACE ${CHROOTEXEC} /usr/bin/apt-get clean || true create_basetgz cleanbuildplace - trap exit sighup + trap - exit sighup exit 0 fi fi umountproc_cleanbuildplace - trap exit sighup + trap - exit sighup exit 0 ;; --dumpconfig|dumpconfig) diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index a71ff60..74cef90 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -165,6 +165,6 @@ else fi cleanbuildplace -trap exit sighup +trap - exit sighup echobacktime exit 0 diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index 8f9c835..0b5f2a3 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -106,5 +106,5 @@ if [ "${PRESERVE_BUILDPLACE}" = "yes" ]; then else cleanbuildplace fi -trap exit sighup +trap - exit sighup exit 0 diff --git a/pbuilder-modules b/pbuilder-modules index cfa860c..763c308 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -435,18 +435,22 @@ function create_basetgz() { # all trap hooks that should lead to 'exit'; and error exit. function cleanbuildplace_trap () { cleanbuildplace + trap - exit sighup exit 1 } function saveaptcache_umountproc_cleanbuildplace_trap () { saveaptcache_umountproc_cleanbuildplace + trap - exit sighup exit 1 } function umountproc_cleanbuildplace_trap () { umountproc_cleanbuildplace + trap - exit sighup exit 1 } function umountproc_trap () { umountproc + trap - exit sighup exit 1 } diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index fb5bdfd..4be2b56 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -78,5 +78,5 @@ if [ "${PRESERVE_BUILDPLACE}" = "yes" ]; then else cleanbuildplace fi -trap exit sighup +trap - exit sighup exit 0 |