diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-08 23:18:56 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-09 02:20:09 +0000 |
commit | 6125f74b729d28c63a7e5aeb5686497a6a27d8ef (patch) | |
tree | f3adfd9b1171aea594d936977ecb28619971f28f | |
parent | 866a4b0d97a4863c9c0c2f6b984d8f373b11af52 (diff) |
dgit: Dgit parsing: honour dgit.default.old-dsc-distro
-rwxr-xr-x | dgit | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -565,6 +565,7 @@ sub cmd_help () { our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset"; our %defcfg = ('dgit.default.distro' => 'debian', + 'dgit.default.old-dsc-distro' => 'debian', 'dgit-suite.*-security.distro' => 'debian-security', 'dgit.default.username' => '', 'dgit.default.archive-query-default-component' => 'main', @@ -2762,7 +2763,8 @@ sub parse_dsc_field ($$) { $dsc_hint_tag = [ $dsc_hint_tag ]; } elsif ($f =~ m/^\w+\s*$/) { $dsc_hash = $&; - $dsc_distro //= 'debian'; + $dsc_distro //= cfg qw(dgit.default.old-dsc-distro + dgit.default.distro); $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'), $dsc_distro ]; progress "$what: specified git hash"; |