chiark / gitweb /
dgit: Dgit parsing: honour dgit.default.old-dsc-distro
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 8 Jan 2017 23:18:56 +0000 (23:18 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 9 Jan 2017 02:20:09 +0000 (02:20 +0000)
dgit

diff --git a/dgit b/dgit
index 35a2b37..a459d2a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -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";