diff options
-rw-r--r-- | Debian/Dgit.pm | 4 | ||||
-rwxr-xr-x | dgit | 5 | ||||
-rwxr-xr-x | infra/dgit-repos-policy-debian | 2 | ||||
-rwxr-xr-x | infra/dgit-repos-server | 4 |
4 files changed, 10 insertions, 5 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index cb4a599..979dd42 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -19,7 +19,7 @@ BEGIN { $VERSION = 1.00; @ISA = qw(Exporter); @EXPORT = qw(setup_sigwarn - debiantag server_branch server_ref + debiantag_old server_branch server_ref stat_exists link_ltarget hashfile fail ensuredir executable_on_path @@ -125,7 +125,7 @@ sub debugcmd { printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0; } -sub debiantag ($$) { +sub debiantag_old ($$) { my ($v,$distro) = @_; $v =~ y/~:/_%/; return "$distro/$v"; @@ -132,6 +132,11 @@ our @ourdscfield = qw(Dgit Vcs-Dgit-Master); our $csuite; our $instead_distro; +sub debiantag ($$) { + my ($v,$distro) = @_; + return debiantag_old $v, $distro; +} + sub lbranch () { return "$branchprefix/$csuite"; } my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$'; sub lref () { return "refs/heads/".lbranch(); } 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; |