dgit-repos-server: parsetag_general: Abolish $mainfn, use readtag

No functional change.

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

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 21a8024ad56037dfbac6e9bc638d2e3cbfec7580..361fa4a3c32a2009f2586e2246f3e8dc95bb9f7f 100755 (executable)
--- 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+) //) {