diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-13 13:23:21 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-13 16:46:47 +0100 |
commit | 17828118c396929e9a95dbd4d1efd58b747add95 (patch) | |
tree | bd2ffaabbe183dc20df850197af3139141676cd8 /dgit | |
parent | b58684708ff13f563669835c5a9b429acbdda0ac (diff) |
dgit: Provide --clean=dpkg-source[-d],all-check aka -wda / -wdda
This seems logically necessary and could help debug a clean target.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -101,7 +101,7 @@ our %forceopts = map { $_=>0 } our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); our $suite_re = '[-+.0-9a-z]+'; -our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check )? +our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )? | git | git-ff | check (?: ,ignores )? | none @@ -6218,7 +6218,7 @@ sub clean_tree_check_git_wd ($) { my ($message) = @_; return if $cleanmode =~ m{no-check}; return if $patches_applied_dirtily; # yuk - clean_tree_check_git 1, + clean_tree_check_git +($cleanmode !~ m{all-check}), (f_ <<END, $message); %s If this is just missing .gitignore entries, use a different clean @@ -7280,11 +7280,12 @@ sub parseopts () { } elsif (s/^-wgf$//s) { push @ropts, $&; $cleanmode = 'git-ff'; - } elsif (s/^-wd(d?)([n]?)$//s) { + } elsif (s/^-wd(d?)([na]?)$//s) { push @ropts, $&; $cleanmode = 'dpkg-source'; $cleanmode .= '-d' if $1; $cleanmode .= ',no-check' if $2 eq 'n'; + $cleanmode .= ',all-check' if $2 eq 'a'; } elsif (s/^-wc$//s) { push @ropts, $&; $cleanmode = 'check'; |