From ce75647a9a9ef614c5ea2f45b198f8e79f2063e4 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Wed, 28 Oct 2015 15:41:56 +0000 Subject: no need to load runhooks anymore now that it's all handled in -modules Gbp-Dch: ignore --- pbuilder | 3 --- pbuilder-buildpackage | 1 - pbuilder-createbuildenv | 1 - pbuilder-updatebuildenv | 1 - 4 files changed, 6 deletions(-) diff --git a/pbuilder b/pbuilder index a7e4985..582c689 100755 --- a/pbuilder +++ b/pbuilder @@ -53,7 +53,6 @@ case "$1" in --login|login) shift . /usr/lib/pbuilder/pbuilder-checkparams - . /usr/lib/pbuilder/pbuilder-runhooks extractbuildplace trap umountproc_cleanbuildplace_trap exit sighup copyinputfile "${BUILDPLACE}$BUILDDIR" @@ -99,7 +98,6 @@ File extracted to: $BUILDPLACE # try to execute arbitrary program. shift . /usr/lib/pbuilder/pbuilder-checkparams - . /usr/lib/pbuilder/pbuilder-runhooks EXECPROGRAM="$1" shift if [ ! -f "${EXECPROGRAM}" ]; then @@ -146,7 +144,6 @@ File extracted to: $BUILDPLACE --dumpconfig|dumpconfig) shift . /usr/lib/pbuilder/pbuilder-checkparams - . /usr/lib/pbuilder/pbuilder-runhooks extractbuildplace trap umountproc_cleanbuildplace_trap exit sighup executehooks "F" diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index dd99ccc..daeb077 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -22,7 +22,6 @@ export LC_ALL=C set -e . /usr/lib/pbuilder/pbuilder-checkparams -. /usr/lib/pbuilder/pbuilder-runhooks . /usr/lib/pbuilder/pbuilder-buildpackage-funcs PACKAGENAME="$1" diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index 15be713..81c3a81 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -21,7 +21,6 @@ set -e . /usr/lib/pbuilder/pbuilder-checkparams -. /usr/lib/pbuilder/pbuilder-runhooks if [ -z "$DISTRIBUTION" ]; then DISTRIBUTION=sid diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index f745cf4..3e1a680 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -19,7 +19,6 @@ set -e . /usr/lib/pbuilder/pbuilder-checkparams -. /usr/lib/pbuilder/pbuilder-runhooks if [ -n "$DISTRIBUTION" ] && [ "$OVERRIDE_APTLINES" = "yes" ]; then log "I: Upgrading for distribution $DISTRIBUTION" -- cgit v1.2.3