From 134136229bc4e6638d4a064b92a43b2e4f6bc341 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 5 Jul 2019 19:34:16 +0100 Subject: dgit-repos-server: parsetag_general: New argument $need_distro No functional change with the existing call site. Signed-off-by: Ian Jackson --- infra/dgit-repos-server | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index 7b8849a..ee4d5c5 100755 --- 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 $!; -- cgit v1.2.3