X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=f7d1b045b82c53af39c5144e366b43e65ce223f4;hp=3c8734194c13368e04750da23fd027a8165a22a7;hb=f161f45247f812f366a76e039035255450d4e522;hpb=2fe42d36da42a62e8082d0d1c4c35943e8281e9e

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 3c873419..f7d1b045 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -342,7 +342,8 @@ sub movetogarbage () {
 
     ensuredir "$dgitrepos/_removed-tags";
     open PREVIOUS, ">>", removedtagsfile or die removedtagsfile." $!";
-    git_for_each_ref('refs/tags/'.debiantag_old('*',$distro), sub {
+    git_for_each_ref([ map { 'refs/tags/'.$_ } debiantags('*',$distro) ],
+		     sub {
 	my ($objid,$objtype,$fullrefname,$reftail) = @_;
 	print PREVIOUS "\n$objid $reftail .\n" or die $!;
     }, $real);
@@ -496,7 +497,7 @@ sub readupdates () {
 	printdebug " upd.| $_\n";
 	m/^(\S+) (\S+) (\S+)$/ or die "$_ ?";
 	my ($old, $sha1, $refname) = ($1, $2, $3);
-	if ($refname =~ m{^refs/tags/(?=$distro/)}) {
+	if ($refname =~ m{^refs/tags/(?=(?:archive/)?$distro/)}) {
 	    reject "pushing multiple tags!" if defined $tagname;
 	    $tagname = $'; #';
 	    $tagval = $sha1;
@@ -821,9 +822,16 @@ 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_old $version, $distro;
-    printdebug "expected tag $expecttagname\n";
-    $tagname eq $expecttagname or die;
+    my @expecttagnames = debiantags($version, $distro);
+    printdebug "expected tag @expecttagnames\n";
+    grep { $tagname eq $_ } @expecttagnames or die;
+
+    foreach my $othertag (grep { $_ ne $tagname } @expecttagnames) {
+	reject "tag $othertag (pushed with differing dgit version)".
+	    " already exists -".
+	    " not replacing previously-pushed version"
+	    if git_get_ref "refs/tags/".$othertag;
+    }
 
     lockrealtree();