aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xpbuilder-createbuildenv1
-rw-r--r--pbuilder-runhooks5
-rwxr-xr-xpbuilder-updatebuildenv4
4 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index d616f70..459142e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pbuilder (0.8.0.20011013) unstable; urgency=low
+pbuilder (0.8.0.20011021) unstable; urgency=low
* allow use of hardlinks in apt cache handling, with new option
APTCACHEHARDLINK. This cannot be enabled if pbuilder
@@ -6,8 +6,10 @@ pbuilder (0.8.0.20011013) unstable; urgency=low
It should speed up processing.
* Depends on wget, since debootstrap only recommends, and I think this
program is not quite functional as it is without wget
+ * fix runhook breakage introduced by my hacking around with quotes.
+ * Make runhook work as advertized in pbuilder.1 manpage. (closes: #116416)
- -- Junichi Uekawa <dancer@debian.org> Sat, 13 Oct 2001 16:45:47 +0900
+ -- Junichi Uekawa <dancer@debian.org> Sun, 21 Oct 2001 13:37:42 +0900
pbuilder (0.8) unstable; urgency=low
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index e8d85c0..4d03e84 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -57,6 +57,7 @@ $CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKA
$CHROOTEXEC /usr/bin/apt-get clean
if [ -n "$HOOKDIR" ]; then
executehooks "X"
+ unloadhooks
fi
umountproc
echo " -> creating base.tgz"
diff --git a/pbuilder-runhooks b/pbuilder-runhooks
index 70cc8d7..da7cf4a 100644
--- a/pbuilder-runhooks
+++ b/pbuilder-runhooks
@@ -18,6 +18,9 @@
#
# HISTORY:
# $Log$
+# Revision 1.11 2001/10/21 05:03:21 dancer
+# fixing bugs related to runhooks, reported by Dale. Some serious logic disorder seems to be.
+#
# Revision 1.10 2001/10/12 16:56:41 dancer
# changing the error message to warning, because these messages do not stop execution
#
@@ -71,7 +74,7 @@ function loadhooks () {
fi
if [ -d "$HOOKDIR" ]; then
mkdir -p "$BUILDPLACE/tmp/hooks"
- cp -a "$HOOKDIR/*" "$BUILDPLACE/$hooks"
+ cp -a "$HOOKDIR/"* "$BUILDPLACE/$hooks"
fi
}
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 7031931..aa21a40 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -21,8 +21,8 @@ $CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKA
$CHROOTEXEC /usr/bin/apt-get clean
if [ -n "$HOOKDIR" ]; then
- executehooks
- unloadhooks "X"
+ executehooks "X"
+ unloadhooks
fi
umountproc