1 files changed, 12 insertions, 4 deletions
diff --git a/pbuilder-modules b/pbuilder-modules
index ac03ad8..98c1868 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -504,23 +504,31 @@ function copyinputfile() {
 
 # all trap hooks that should lead to 'exit'; and error exit.
 function cleanbuildplace_trap () {
+    trap "" sigpipe sighup
+    set +e
     cleanbuildplace
-    trap - exit sighup
+    trap - exit sighup sigpipe
     exit 1
 }
 function saveaptcache_umountproc_cleanbuildplace_trap () {
+    trap "" sigpipe sighup
+    set +e
     saveaptcache_umountproc_cleanbuildplace
-    trap - exit sighup
+    trap - exit sighup sigpipe
     exit 1
 }
 function umountproc_cleanbuildplace_trap () {
+    trap "" sigpipe sighup
+    set +e
     umountproc_cleanbuildplace
-    trap - exit sighup
+    trap - exit sighup sigpipe
     exit 1
 }
 function umountproc_trap () {
+    trap "" sigpipe sighup
+    set +e
     umountproc
-    trap - exit sighup
+    trap - exit sighup sigpipe
     exit 1
 }