From 8a178bf100d49ad948f5f3ec5540da1ff9c74c3e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jul 2016 15:16:06 +0100 Subject: [PATCH] Tag change: Update dgit-repos-policy-debian The only place where we call debiantag, and the only place where we know about tag names, is in vsn_in_our_history. We need to change it to query multiple tags. Signed-off-by: Ian Jackson --- infra/dgit-repos-policy-debian | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian index 62a275ac..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_old $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; + $_ = ; + close F; + return 1 if defined && m/\S/; + die "$pkg tagrefs @tagrefs $? $!" if $?; + return 0; } sub specific_suite_has_suitable_vsn ($$) { -- 2.30.2