summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-16 20:12:13 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-16 20:12:13 +0100
commit8601f11872048f1e3209188d2636d7344c75177e (patch)
tree02330884f687aaae979f270fc8eed5a0737e2962 /dgit
parent2f0cebfee6ee94456b0b296ea16a30727ba9a414 (diff)
fix madison thing
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit8
1 files changed, 5 insertions, 3 deletions
diff --git a/dgit b/dgit
index b25c4a3..e4b1177 100755
--- a/dgit
+++ b/dgit
@@ -209,7 +209,7 @@ sub parsechangelog {
return $c;
}
-our $rmad;
+our %rmad;
sub archive_query () {
my $query = access_cfg('archive-query');
@@ -218,13 +218,15 @@ sub archive_query () {
my $proto = $1;
my $url = $'; #';
die unless $proto eq 'madison';
- $rmad ||= cmdoutput qw(rmadison -asource),"-s$suite","-u$url",$package;
+ $rmad{$package} ||= cmdoutput
+ qw(rmadison -asource),"-s$suite","-u$url",$package;
+ my $rmad = $rmad{$package};
if (!length $rmad) {
return ();
}
$rmad =~ m{^ \s*( [^ \t|]+ )\s* \|
\s*( [^ \t|]+ )\s* \|
- \s*( [^ \t|/]+ )(?:/([^ \t|/]+)) \s* \|
+ \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
\s*( [^ \t|]+ )\s* }x or die "$rmad $?";
$1 eq $package or die "$rmad $package ?";
my $vsn = $2;