summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-13 17:01:50 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-13 17:32:01 +0000
commit87e828d271c0f37bb33ca723fa991d6afc3ec76f (patch)
tree4d6348605d869bddf3a0c1fb7ea0cccd5ffeb253
parent8e4a69d54bb811aabe6eb2b133d142771c30f997 (diff)
dgit: parse_dsc_field: Break out $def_dsc_distro
No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit9
1 files changed, 7 insertions, 2 deletions
diff --git a/dgit b/dgit
index 68ab4b0..5ca4a81 100755
--- a/dgit
+++ b/dgit
@@ -2806,6 +2806,12 @@ sub parse_dsc_field ($$) {
$f = $dsc->{$field};
last if defined $f;
}
+
+ my $def_dsc_distro = sub {
+ $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
+ dgit.default.distro);
+ };
+
if (!defined $f) {
progress "$what: NO git hash";
} elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
@@ -2814,8 +2820,7 @@ sub parse_dsc_field ($$) {
$dsc_hint_tag = [ $dsc_hint_tag ];
} elsif ($f =~ m/^\w+\s*$/) {
$dsc_hash = $&;
- $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
- dgit.default.distro);
+ $def_dsc_distro->();
$dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
$dsc_distro ];
progress "$what: specified git hash";