diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-09 02:04:31 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-09 13:08:32 +0000 |
commit | a0fafdb431fa23f6de127a8d38a62ccfc12f3537 (patch) | |
tree | a59965017ba0de4d01a9cca00d3e3f9581442d64 /dgit | |
parent | 93f0f211695dc8aa6b4cfc4063766f71dc074fc1 (diff) |
Honour dgit-distro.*.default-suite and dgit.default.default-suite.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -48,7 +48,7 @@ our $absurdity = undef; ###substituted### our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format our $protovsn; -our $isuite = 'unstable'; +our $isuite; our $idistro; our $package; our @ropts; @@ -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.default-suite' => 'unstable', 'dgit.default.old-dsc-distro' => 'debian', 'dgit-suite.*-security.distro' => 'debian-security', 'dgit.default.username' => '', @@ -6445,6 +6446,10 @@ END sub parseopts_late_defaults () { + $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF') + if defined $idistro; + $isuite //= cfg('dgit.default.default-suite'); + foreach my $k (keys %opts_opt_map) { my $om = $opts_opt_map{$k}; |