From 26f2213a36af62d526a41ad96caef7f3c4aa507a Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Jul 2016 13:51:46 +0100
Subject: Tag change: Rename debiantag to debiantag_old

We are going to change the tag name of the main signed tag used by
dgit to signal the user's intent to the archive server.

Prepare for this by changing debiantag to debiantag_old and changing
all call sites outside dgit itself.

dgit will want to be able to generate either, depending on whether
it's cooperating in an rpush with a new or old dgit so reintroduce a
wrapper called debiantag there.  This will also allow us to have dgit
generate old tags for testing.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 infra/dgit-repos-policy-debian | 2 +-
 infra/dgit-repos-server        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'infra')

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 4dab576..62a275a 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -109,7 +109,7 @@ sub apiquery ($) {
 sub vsn_in_our_history ($) {
     my ($vsn) = @_;
 
-    my $tagref = "refs/tags/".debiantag $vsn, $distro;
+    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;
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index cfa0f31..ea223a0 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -342,7 +342,7 @@ sub movetogarbage () {
 
     ensuredir "$dgitrepos/_removed-tags";
     open PREVIOUS, ">>", removedtagsfile or die removedtagsfile." $!";
-    git_for_each_ref('refs/tags/'.debiantag('*',$distro), sub {
+    git_for_each_ref('refs/tags/'.debiantag_old('*',$distro), sub {
 	my ($objid,$objtype,$fullrefname,$reftail) = @_;
 	print PREVIOUS "\n$objid $reftail .\n" or die $!;
     }, $real);
@@ -821,7 +821,7 @@ sub checks () {
     tagh1('object') eq $commit or reject "tag refers to wrong commit";
     tagh1('tag') eq $tagname or reject "tag name in tag is wrong";
 
-    my $expecttagname = debiantag $version, $distro;
+    my $expecttagname = debiantag_old $version, $distro;
     printdebug "expected tag $expecttagname\n";
     $tagname eq $expecttagname or die;
 
-- 
cgit v1.2.1