From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Oct 2016 17:32:20 +0000 (+0100)
Subject: dgit: Import handling Do not crash due in clone
X-Git-Tag: archive/debian/2.1~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=67076f7426abe4204d133325bd632eb4bd8e2c68

dgit: Import handling Do not crash due in clone

Previously we failed to handle dpkg-parsechangelog SIGPIPE.
Closes:#840989.

Fixes:
  dgit: failed command: dpkg-parsechangelog --format rfc822 --all
  dgit: subprocess died due to fatal signal PIPE

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index e35438e2..505f3927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 dgit (2.1~~) unstable; urgency=medium
 
+  * Do not crash due in clone to failure to handle dpkg-parsechangelog
+    SIGPIPE.  Closes:#840989.  Avoids:
+       dgit: failed command: dpkg-parsechangelog --format rfc822 --all
+       dgit: subprocess died due to fatal signal PIPE
   * git- prefixes: Fix some occurrences of `git-foo' in infrastructure,
     messages, and test suite.  Filter out .../git-core from PATH in
     test suite so that we catch future occurrences.
diff --git a/dgit b/dgit
index 0507899b..a568c579 100755
--- a/dgit
+++ b/dgit
@@ -1846,7 +1846,7 @@ sub generate_commits_from_dsc () {
 	printdebug "import clog $r1clogp->{version} becomes r1\n";
     }
     die $! if CLOGS->error;
-    close CLOGS or $?==(SIGPIPE<<8) or failedcmd @clogcmd;
+    close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
 
     $clogp or fail "package changelog has no entries!";