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=cff5d06cd33d80107a281dad33135db87e81e99d;hp=d687a3e065501d3ffea00b238333ceb291e35133;hb=86cbeb5e4396d0722aaf3049cc01d084117bb8a4;hpb=86daff8924bab3297885cfe375341bf3f4ffe09c

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index d687a3e0..cff5d06c 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -1,8 +1,24 @@
 #!/usr/bin/perl -w
 # dgit repos policy hook script for Debian
+#
+# Copyright (C) 2015-2016  Ian Jackson
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
 
+use Debian::Dgit::Infra; # must precede Debian::Dgit; - can change @INC!
 use Debian::Dgit qw(:DEFAULT :policyflags);
 setup_sigwarn();
 
@@ -109,12 +125,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 ($$) {
@@ -331,6 +355,10 @@ END
     my $checkpid = open CHKOUT, "-|" // die $!;
     if (!$checkpid) {
 	open STDIN, "<&", $chkinput or die $!;
+	delete $ENV{GIT_ALTERNATE_OBJECT_DIRECTORIES};
+	# ^ recent versions of git set this in the environment of
+	# receive hooks.  This can cause us to see things which
+	# the user is trying to abolish.
 	exec @objscatcmd or die $!;
     }
 
@@ -352,9 +380,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 +392,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