From 9688b22bc39f3bff45dc1b0965fc0ad9e4260752 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Tue, 13 Oct 2015 18:02:46 +0000 Subject: always load hooks just after extracting the build place, and unload them when cleaning up So, no need to load&run&unload everywhere as it is now. Gbp-Dch: Short --- pbuilder | 5 ----- 1 file changed, 5 deletions(-) (limited to 'pbuilder') diff --git a/pbuilder b/pbuilder index 424dc4e..a7e4985 100755 --- a/pbuilder +++ b/pbuilder @@ -57,7 +57,6 @@ case "$1" in extractbuildplace trap umountproc_cleanbuildplace_trap exit sighup copyinputfile "${BUILDPLACE}$BUILDDIR" - loadhooks recover_aptcache trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup @@ -83,7 +82,6 @@ File extracted to: $BUILDPLACE exit 1 else log "I: Saving the results, modifications to this session will persist" - unloadhooks umountproc trap cleanbuildplace_trap exit sighup ${CHROOTEXEC} /usr/bin/apt-get clean || true @@ -112,7 +110,6 @@ File extracted to: $BUILDPLACE trap umountproc_cleanbuildplace_trap exit sighup copyinputfile "${BUILDPLACE}$BUILDDIR" - loadhooks recover_aptcache trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup @@ -133,7 +130,6 @@ File extracted to: $BUILDPLACE log "E: Invalid combination of internal-build-uml and save-after-login flags" else log "I: Saving the results, modifications to this session will persist" - unloadhooks umountproc trap cleanbuildplace_trap exit sighup ${CHROOTEXEC} /usr/bin/apt-get clean || true @@ -153,7 +149,6 @@ File extracted to: $BUILDPLACE . /usr/lib/pbuilder/pbuilder-runhooks extractbuildplace trap umountproc_cleanbuildplace_trap exit sighup - loadhooks executehooks "F" log "I: start dump config" log "I: set" -- cgit v1.2.3