diff options
-rw-r--r-- | debian/changelog | 1 | ||||
-rwxr-xr-x | dgit | 7 | ||||
-rw-r--r-- | dgit.1 | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 3a2a8cd..158bcae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ dgit (3.0~) unstable; urgency=medium * distro alias facility in config space. (Primarily for testing.) * Undocumented --config-lookup-explode= feature. (For testing.) * Provide `dgit print-dgit-repos-server-source-url'. Re:#850521. + * Honour dgit-distro.*.default-suite and dgit.default.default-suite. dgit-badcommit-fixup: * Do not investigate symrefs. Closes:#850547. @@ -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}; @@ -947,6 +947,9 @@ may be a glob pattern. .BI dgit.default.distro " distro" The default distro for an unknown suite. .TP +.BI dgit.default.default-suite " suite" +The default suite (eg for clone). +.TP .BR dgit.default. * for each .BR dgit-distro. \fIdistro\fR . *, |