From 0457c2d771ef6fe6c0883344add9dd4da0c60917 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 13 Oct 2018 10:55:36 +0100 Subject: [PATCH 1/1] dgit: Honour new .clean-mode-newer access config option This will allow us to extend the set of clean modes without causing irresolvable compatibility problems for users. Signed-off-by: Ian Jackson --- dgit | 5 ++++- dgit.1 | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index de14c1ef..8c7f288a 100755 --- a/dgit +++ b/dgit @@ -7355,7 +7355,10 @@ sub parseopts_late_defaults () { if (!defined $cleanmode) { local $access_forpush; - $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF'); + $cleanmode = access_cfg('clean-mode-newer', 'RETURN-UNDEF'); + $cleanmode = undef if $cleanmode && $cleanmode !~ m/^$cleanmode_re$/; + + $cleanmode //= access_cfg('clean-mode', 'RETURN-UNDEF'); $cleanmode //= 'dpkg-source'; badcfg f_ "unknown clean-mode \`%s'", $cleanmode unless diff --git a/dgit.1 b/dgit.1 index d34231fd..ccf1ea59 100644 --- a/dgit.1 +++ b/dgit.1 @@ -1219,7 +1219,13 @@ the default value used if there is no distro-specific setting. One of the values for the command line --clean= option; used if --clean is not specified. .TP -.BR dgit-distro. \fIdistro\fR .quilt-mode +.BR dgit-distro. \fIdistro\fR .clean-mode-newer +Like .clean-mode, +but ignored if the value does not make sense to this version of dgit. +Setting both .clean-mode and .clean-mode-newer is useful +to provide a single git config compatible with different dgit versions. +.TP +.BR dgit-distro. \fIdistro\fR .quilt- One of the values for the command line --quilt= option; used if --quilt is not specified. .TP -- 2.30.2