From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Jul 2019 09:33:46 +0000 (+0100)
Subject: dgit-repos-server: parsetag_general: Abolish $mainfn, use readtag
X-Git-Tag: archive/debian/9.1~75
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=581e4e76d488cee8af76798780cbd34d702442dd

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 21a8024a..361fa4a3 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+) //) {