+

+	* pbuilder-buildpackage: Changed to work with trap instead of other
+	kludgy alternatives.
+
+	* pbuilder-buildpackage-funcs: fixed to use trap for buildpackage hooks.
+

1 files changed, 1 insertions, 4 deletions

diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index 76dd913..ee9f973 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -26,16 +26,13 @@ function copydsc () {
 	$(cat "$DSCFILE" | \
 	awk 'BEGIN{p=0} /^$/ {p=0} /^.*:/ {p=0} {if (p){print "'$(dirname "$DSCFILE")'/" $3}} /^Files:/{p=1}' ) ; do
 	echo "    -> copying [$FILE]"
-        if ! cp "$FILE" "$TARGET" ; then
-	    umountproc_cleanbuildplace
-	fi
+        cp "$FILE" "$TARGET" 
     done
 }
 
 function checkbuilddep () {
     if ! /usr/lib/pbuilder/pbuilder-satisfydepends --control "$BUILDPLACE/"tmp/buildd/*/debian/control --chroot "$BUILDPLACE" --binary-all ; then
 	echo "E: pbuilder-satisfydepends failed." >&2
-	saveaptcache_umountproc_cleanbuildplace
 	exit 1
     fi
     # install extra packages to the chroot