summaryrefslogtreecommitdiff
path: root/infra
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-06 10:33:46 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-06 15:58:10 +0100
commit581e4e76d488cee8af76798780cbd34d702442dd (patch)
tree7fcb71a20d6ab7d9dfa62252f3dcd6eff4a5aa98 /infra
parent6704aa487d7a753dc8a6a3269813b77cdce65867 (diff)
dgit-repos-server: parsetag_general: Abolish $mainfn, use readtag
No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'infra')
-rwxr-xr-xinfra/dgit-repos-server20
1 files changed, 9 insertions, 11 deletions
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 21a8024..361fa4a 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -572,13 +572,10 @@ sub readtag () {
$!=0; $_=<T>; defined or die $!;
}
-sub parsetag_general ($$;$) {
- my ($mainfn, $dgititemfn, $need_distro) = @_;
+sub parsetag_general ($;$) {
+ my ($dgititemfn, $need_distro) = @_;
printdebug " parsetag...\n";
- readtag();
- $mainfn->();
-
my $copyl = $_;
for (;;) {
print PT $copyl or die $!;
@@ -615,13 +612,14 @@ sub parsetag_general ($$;$) {
}
sub parsetag () {
+ readtag();
+ m/^($package_re) release (\S+) for \S+ \((\S+)\) \[dgit\]$/ or
+ reject "tag message not in expected format";
+ die unless $1 eq $package;
+ $version = $2;
+ die "$3 != $suite " unless $3 eq $suite;
+
parsetag_general sub {
- m/^($package_re) release (\S+) for \S+ \((\S+)\) \[dgit\]$/ or
- reject "tag message not in expected format";
- die unless $1 eq $package;
- $version = $2;
- die "$3 != $suite " unless $3 eq $suite;
- }, sub {
if (s/^(--deliberately-$deliberately_re) //) {
push @deliberatelies, $1;
} elsif (s/^previously:(\S+)=(\w+) //) {