diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-13 10:55:36 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-13 10:55:36 +0100 |
commit | 0457c2d771ef6fe6c0883344add9dd4da0c60917 (patch) | |
tree | 742d70a970aaddc7763bc333d1f84af466fbb050 | |
parent | 7053910ee1c73badd2df933b28e5fdad8eee161f (diff) |
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 <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 5 | ||||
-rw-r--r-- | dgit.1 | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -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 @@ -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 |