X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=e37690c0b495791cdc2adac29cc6b3e87dc950ce;hp=7ad2c7d57b48145d095e68d8d80fa2e314f42bff;hb=8a178bf100d49ad948f5f3ec5540da1ff9c74c3e;hpb=496eedd22761330b59f4f7b81d2b860e154c9b37

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 7ad2c7d5..e37690c0 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -109,12 +109,20 @@ sub apiquery ($) {
 sub vsn_in_our_history ($) {
     my ($vsn) = @_;
 
-    my $tagref = "refs/tags/".debiantag $vsn, $distro;
-    printdebug " checking history  vsn=$vsn tagref=$tagref\n";
-    $?=0; my $r = system qw(git show-ref --verify --quiet), $tagref;
-    return 1 if !$r;
-    return 0 if $r==256;
-    die "$pkg tagref $tagref $? $!";
+    # Eventually, when we withdraw support for old-format (DEP-14
+    # namespace) tags, we will need to change this to only look
+    # for debiantag_new.  See the commit
+    #   "Tag change: Update dgit-repos-policy-debian"
+    # (reverting which is a good start for that change).
+
+    my @tagrefs = map { "refs/tags/".$_ } debiantags $vsn, $distro;
+    printdebug " checking history  vsn=$vsn tagrefs=@tagrefs\n";
+    open F, "-|", qw(git-for-each-ref), @tagrefs;
+    $_ = <F>;
+    close F;
+    return 1 if defined && m/\S/;
+    die "$pkg tagrefs @tagrefs $? $!" if $?;
+    return 0;
 }
 
 sub specific_suite_has_suitable_vsn ($$) {
@@ -352,11 +360,8 @@ 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$/;
@@ -364,7 +369,12 @@ END
 	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 +382,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})