From a0fafdb431fa23f6de127a8d38a62ccfc12f3537 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 9 Jan 2017 02:04:31 +0000
Subject: Honour dgit-distro.*.default-suite and dgit.default.default-suite.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index d0cbd32..f6c845d 100755
--- a/dgit
+++ b/dgit
@@ -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};
 
-- 
cgit v1.2.3