Split brain: Better tag format filtering

[dgit.git] / dgit

diff --git a/dgit b/dgit
index cb6a17787a3152ec3326ab32c81bffb667949de0..5dfd97c7fdc45d3a0f4b9f2f53d67669845d8681 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -534,6 +534,9 @@ our %defcfg = ('dgit.default.distro' => 'debian',
               'dgit.default.archive-query' => 'madison:',
               'dgit.default.sshpsql-dbname' => 'service=projectb',
               'dgit.default.dgit-tag-format' => 'old,new,maint',
+              # old means "repo server accepts pushes with old dgit tags"
+              # new means "repo server accepts pushes with new dgit tags"
+              # maint means "repo server accepts split brain pushes"
               'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
               'dgit-distro.debian.git-check' => 'url',
               'dgit-distro.debian.git-check-suffix' => '/info/refs',
@@ -1194,7 +1197,7 @@ sub select_tagformat () {
     die 'bug' if $tagformatfn && $tagformat_want;
     # ... $tagformat_want assigned after previous select_tagformat
 
-    my (@supported) = grep { $_ ne 'maint' } access_cfg_tagformats();
+    my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
     printdebug "select_tagformat supported @supported\n";
 
     $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
@@ -2367,15 +2370,22 @@ END
 };
 
 sub infopair_lrf_tag_lookup ($$) {
-    my ($tagname, $what) = @_;
-    printdebug "infopair_lrfetchref_tag_lookup $what\n";
-    my $lrefname = lrfetchrefs."/tags/$tagname";
-    my $tagobj = $lrfetchrefs_f{$lrefname};
-    defined $tagobj or fail <<END;
-Wanted tag $tagname ($what) on dgit server, but not found
+    my ($tagnames, $what) = @_;
+    # $tagname may be an array ref
+    my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
+    printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
+    foreach my $tagname (@tagnames) {
+       my $lrefname = lrfetchrefs."/tags/$tagname";
+       my $tagobj = $lrfetchrefs_f{$lrefname};
+       next unless defined $tagobj;
+       printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
+       return [ git_rev_parse($tagobj), $what ];
+    }
+    fail @tagnames==1 ? <<END : <<END;
+Wanted tag $what (@tagnames) on dgit server, but not found
+END
+Wanted tag $what (one of: @tagnames) on dgit server, but not found
 END
-    printdebug "infopair_lrfetchref_tag_lookup $tagobj $what\n";
-    return [ git_rev_parse($tagobj), $what ];
 }
 
 sub infopair_cond_ff ($$) {