No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
$!=0; $_=<T>; defined or die $!;
}
$!=0; $_=<T>; defined or die $!;
}
-sub parsetag_general ($;$) {
- my ($dgititemfn, $need_distro) = @_;
+sub parsetag_general ($$) {
+ my ($dgititemfn, $distrofn) = @_;
printdebug " parsetag...\n";
my $copyl = $_;
printdebug " parsetag...\n";
my $copyl = $_;
while (length) {
if ($dgititemfn->()) {
} elsif (s/^distro\=(\S+) //) {
while (length) {
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 ($_)";
} elsif (s/^[-+.=0-9a-z]\S* //) {
} else {
die "unknown dgit info in tag ($_)";
}
last if m/^-----BEGIN PGP/;
}
}
last if m/^-----BEGIN PGP/;
}
- reject "need distro info in tag" if $need_distro;
+ }, sub {
+ my ($gotdistro) = @_;
+ die "$gotdistro != $distro" unless $gotdistro eq $distro;