diff options
| author | Mattia Rizzolo <mattia@mapreri.org> | 2015-10-13 18:02:46 +0000 |
|---|---|---|
| committer | Mattia Rizzolo <mattia@mapreri.org> | 2015-10-13 18:02:46 +0000 |
| commit | 9688b22bc39f3bff45dc1b0965fc0ad9e4260752 (patch) | |
| tree | a434950a0237a8f5fa496a564cae4ae3e8dcf173 /pbuilder-modules | |
| parent | 5cd1f5e92353bb228a422222d998e7fd6fd0a7ae (diff) | |
| download | pbuilder-9688b22bc39f3bff45dc1b0965fc0ad9e4260752.tar pbuilder-9688b22bc39f3bff45dc1b0965fc0ad9e4260752.tar.gz | |
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
Diffstat (limited to 'pbuilder-modules')
| -rw-r--r-- | pbuilder-modules | 5 |
1 files changed, 5 insertions, 0 deletions
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 |