Merge branch 'master' of ssh://git.debian.org/git/pbuilder/pbuilder

5 files changed, 39 insertions, 17 deletions

diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml
index b23e783..b75d20d 100644
--- a/Documentation/pbuilder-doc.xml
+++ b/Documentation/pbuilder-doc.xml
@@ -1367,7 +1367,9 @@ git-clone ssh://git.debian.org/git/pbuilder/pbuilder.git</screen>
 	When making changes, changes should be documented in the Git
 	commit log.  git-dch will generate debian/changelog from the
 	commit log. Make the first line of your commit log meaningful,
-	and add any bug-closing information available.	
+	and add any bug-closing information available.
+	debian/changelog should not be edited directly unless when
+	releasing a new version.
       </para>
       <para>
 	A TODO file is available in <filename>debian/TODO</filename>.
diff --git a/debian/changelog b/debian/changelog
index 642cc86..95ac335 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
-pbuilder (0.186.0snapshot) UNRELEASED; urgency=low
+pbuilder (0.187) unstable; urgency=low
 
-  * 
-
- -- Junichi Uekawa <dancer@debian.org>  Thu, 26 Feb 2009 13:21:03 +0900
+  [ Junichi Uekawa ]
+  * gcc is not a useful dependency of pbuilder (closes: #486492)
+  * warn if --othermirror is specified and --override-config
+    is not specified. (closes: #493154)
+  * refactor to use 'log' function rather than using 'echo' directly.
+  * implement --inputfile option.
+  * handle packages line wrapping with something other than ',' in
+    Build-Depends (closes: 519306)
+
+  [ Stefan Fritsch ]
+  * Bug#520251: pbuilder: Pbuilder does not umount bindmounts when ssh
+    connection dies
+
+ -- Junichi Uekawa <dancer@debian.org>  Sat, 21 Mar 2009 12:47:46 +0900
 
 pbuilder (0.186) unstable; urgency=low
 
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 2be908e..0fbaf2e 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -52,7 +52,7 @@ export HOME="/tmp/buildd"
 
 echobacktime
 extractbuildplace 
-trap umountproc_cleanbuildplace_trap exit sighup
+trap umountproc_cleanbuildplace_trap exit sighup sigpipe
 loadhooks
 
 if [ ! -d "${BUILDRESULT}" ]; then
@@ -89,10 +89,10 @@ recover_aptcache
 createbuilduser
 log "I: Installing the build-deps"
 executehooks "D"
-trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup
+trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup sigpipe
 checkbuilddep "$PACKAGENAME"
 save_aptcache
-trap umountproc_cleanbuildplace_trap exit sighup
+trap umountproc_cleanbuildplace_trap exit sighup sigpipe
 
 log "I: Copying source file"
 copydsc "$PACKAGENAME" "$BUILDPLACE/tmp/buildd"
@@ -140,7 +140,7 @@ else
 fi
 
 if ! wait ${BUILD_PID}; then
-    trap umountproc_cleanbuildplace_trap exit sighup
+    trap umountproc_cleanbuildplace_trap exit sighup sigpipe
     eval "${KILL_WAIT_PID}"
     log "E: Failed autobuilding of package"
     executehooks "C"
@@ -150,10 +150,10 @@ else
     # build was successful
 fi
 
-trap umountproc_cleanbuildplace_trap exit sighup
+trap umountproc_cleanbuildplace_trap exit sighup sigpipe
 executehooks "B"
 save_aptcache
-trap cleanbuildplace_trap exit sighup
+trap cleanbuildplace_trap exit sighup sigpipe
 umountproc
 
 
@@ -167,6 +167,6 @@ fi
 
 :
 cleanbuildplace
-trap - exit sighup
+trap - exit sighup sigpipe
 echobacktime
 exit 0
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
 }
 
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 97eb466..2cbc8a9 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -44,7 +44,8 @@ fi
 recover_aptcache
 
 $TRAP saveaptcache_umountproc_cleanbuildplace_trap exit sighup
-$CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" -o "APT::Get::AutomaticRemove=true"  dist-upgrade
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes autoremove
 $CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt aptitude $EXTRAPACKAGES
 save_aptcache