dgit-repos-server: parsetag_general: New argument $need_distro

No functional change with the existing call site.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 7b8849a85cfb3162731efc0c469a6f9496da1643..ee4d5c52db3d2c4fa0f35ae5a5294d602d6e6585 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -552,8 +552,8 @@ sub readupdates () {
     printdebug " updates ok.\n";
 }
 
-sub parsetag_general ($$) {
-    my ($mainfn, $dgititemfn) = @_;
+sub parsetag_general ($$;$) {
+    my ($mainfn, $dgititemfn, $need_distro) = @_;
     printdebug " parsetag...\n";
     open PT, ">dgit-tmp/plaintext" or die $!;
     open DS, ">dgit-tmp/plaintext.asc" or die $!;
@@ -584,6 +584,7 @@ sub parsetag_general ($$) {
                if ($dgititemfn->()) {
                } elsif (s/^distro\=(\S+) //) {
                    die "$1 != $distro" unless $1 eq $distro;
+                   $need_distro = 0;
                } elsif (s/^[-+.=0-9a-z]\S* //) {
                } else {
                    die "unknown dgit info in tag ($_)";
@@ -593,6 +594,8 @@ sub parsetag_general ($$) {
        }
        last if m/^-----BEGIN PGP/;
     }
+    reject "need distro info in tag" if $need_distro;
+
     $_ = $copyl;
     for (;;) {
        print DS or die $!;