X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=4dab576f1a4257e3bff41aef8ac4f4b1d30105f1;hp=e56d09096719254c243e77d99193bedaf5d78414;hb=0658281163715a24c940509ebb8b0a7493e33787;hpb=b1e6ef82d508ae7c02c8444d57a6de5cdbf08de9

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index e56d0909..4dab576f 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -352,19 +352,21 @@ 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 "$? $!" unless defined $_;
+	die "($taintid @objscatcmd) $!" unless defined $_;
 	printdebug "|< ", $_ if $debuglevel>=2;
 
 	next if m/^\w+ missing$/;
-	die "($taintid) $_ ?" unless m/^(\w+) (\w+) (\d+)\s/;
+	die "($taintid @objscatcmd) $_ ?" unless m/^(\w+) (\w+) (\d+)\s/;
 	my ($objid,$objtype,$nbytes) = ($1,$2,$3);
 
 	my $drop;
-	(read CHKOUT, $drop, $nbytes) == $nbytes or die;
+	(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 =  ?
@@ -372,7 +374,7 @@ END
         $taintinfoq->execute($taintid);
 
 	my $ti = $taintinfoq->fetchrow_hashref();
-	die unless $ti;
+	die "($taintid)" unless $ti;
 
 	my $timeshow = defined $ti->{time}
 	    ? " at time ".strftime("%Y-%m-%d %H:%M:%S Z", gmtime $ti->{time})