diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-11-23 13:53:19 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-11-23 13:53:19 +0000 |
commit | fd942d74d330773eefca2ac47cdc97e2e8020411 (patch) | |
tree | 504c2a322cc2301d8b9bced49089c8fa61b89947 /dgit | |
parent | efba7aabcf8f5b83a35eec3c5b11b9eb4a70baf3 (diff) |
Make --no-quilt-fixup an alias for (a new option) --quilt=nocheck
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -48,13 +48,12 @@ our $changesfile; our $buildproductsdir = '..'; our $new_package = 0; our $ignoredirty = 0; -our $noquilt = 0; our $rmonerror = 1; our $existing_package = 'dpkg'; our $cleanmode = 'dpkg-source'; our $changes_since_version; our $quilt_mode; -our $quilt_modes_re = 'linear|smash|auto|nofix'; +our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck'; our $we_are_responder; our $initiator_tempdir; @@ -1487,7 +1486,7 @@ sub get_source_format () { sub madformat ($) { my ($format) = @_; return 0 unless $format eq '3.0 (quilt)'; - if ($noquilt) { + if ($quilt_mode eq 'nocheck') { progress "Not doing any fixup of \`$format' due to --no-quilt-fixup"; return 0; } @@ -2683,7 +2682,7 @@ sub parseopts () { $ignoredirty = 1; } elsif (m/^--no-quilt-fixup$/s) { push @ropts, $_; - $noquilt = 1; + $quilt_mode = 'nocheck'; } elsif (m/^--no-rm-on-error$/s) { push @ropts, $_; $rmonerror = 0; |