From 9688b22bc39f3bff45dc1b0965fc0ad9e4260752 Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mattia@mapreri.org>
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-modules | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'pbuilder-modules')

diff --git a/pbuilder-modules b/pbuilder-modules
index 0404d88..de967b3 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -17,6 +17,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+. /usr/lib/pbuilder/pbuilder-runhooks
 
 function showhelp () {
     cat <<EOF
@@ -371,6 +372,7 @@ function cleanbuildplace () {
     if [ "$?" -ne 0 ]; then
         log "W: Aborting with an error";
     fi
+    unloadhooks
     if [ "${INTERNAL_BUILD_UML}" != "yes" ]; then
         if [ -d "$BUILDPLACE" ]; then
             # A directory on the same partition as $BUILDPLACE, bind-mounted
@@ -491,6 +493,7 @@ function extractbuildplace () {
         fi
     fi
     copy_local_configuration
+    loadhooks
 
     # installaptlines may fail with exit 1, do it earlier than mountproc.
     if [ "$OVERRIDE_APTLINES" = "yes" ]; then
@@ -575,6 +578,8 @@ function save_aptcache() {
 }
 
 function create_basetgz() {
+    # don't pack the hooks in
+    unloadhooks
     # create base.tgz
     (
         if ! cd "$BUILDPLACE"; then
-- 
cgit v1.2.3