From f9da2ff21675a630444be1a65ac27fe387581f26 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jun 2016 19:46:07 +0100
Subject: [PATCH] dgit-repos-policy-debian.: fix git-cat-file-handling with
 multiple taints in db (!).

---
 debian/changelog               | 2 ++
 infra/dgit-repos-policy-debian | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7543f58e..21726d08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ dgit (1.5~~) unstable; urgency=medium
 
   Infrastructure:
   * Better error handling in dgit-repos-policy-debian.
+  * dgit-repos-policy-debian.: fix git-cat-file-handling with multiple
+    taints in db (!).
 
   Documentation:
   * Document the dgit-distro.DISTRO.quilt-mode config setting.
diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index d687a3e0..4dab576f 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -352,9 +352,6 @@ END
     my $mustreject=0;
 
     while (my $taintid = shift @taintids) {
-	# git cat-file prints a spurious newline after it gets EOF
-	# This is not documented.  I guess it might go away.  So we
-	# just read what we expect and then let it get SIGPIPE.
 	$!=0; $_ = <CHKOUT>;
 	die "($taintid @objscatcmd) $!" unless defined $_;
 	printdebug "|< ", $_ if $debuglevel>=2;
@@ -367,6 +364,10 @@ END
 	(read CHKOUT, $drop, $nbytes) == $nbytes
 	    or die "($taintid @objscatcmd) $!";
 
+	$!=0; $_ = <CHKOUT>;
+	die "($taintid @objscatcmd) $!" unless defined $_;
+	die "($taintid @objscatcmd) $_ ?" if m/\S/;
+
 	$taintinfoq ||= $poldbh->prepare(<<END);
             SELECT package, time, comment FROM taints WHERE taint_id =  ?
 END
-- 
2.30.2