summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-28 18:35:00 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-28 18:35:04 +0100
commit996489fe48ebd57d4ad5f4a8bff7e2a871dc0a87 (patch)
tree4f44dd21ec2e22e1e59fa988e22e2b3d74161b1a /dgit
parent1ad1f0b16c1383393be69fda98d8326f873cf0e5 (diff)
Do not fail to do some important quilt processing in some --quilt modes.
Make `madformat' mean precisely `is 3.0 (quilt)' and change the two call sites which wanted to check the quilt mode too. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit8
1 files changed, 5 insertions, 3 deletions
diff --git a/dgit b/dgit
index 0cf854d..d8ab871 100755
--- a/dgit
+++ b/dgit
@@ -150,6 +150,8 @@ sub debiantag_maintview ($$) {
return "$distro/$v";
}
+sub madformat ($) { $_[0] eq '3.0 (quilt)' }
+
sub lbranch () { return "$branchprefix/$csuite"; }
my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
sub lref () { return "refs/heads/".lbranch(); }
@@ -2346,7 +2348,7 @@ sub get_source_format () {
return ($_, \%options);
}
-sub madformat ($) {
+sub madformat_wantfixup ($) {
my ($format) = @_;
return 0 unless $format eq '3.0 (quilt)';
our $quilt_mode_warned;
@@ -2750,7 +2752,7 @@ END
my $dgithead = $actualhead;
my $maintviewhead = undef;
- if (madformat($format)) {
+ if (madformat_wantfixup($format)) {
# user might have not used dgit build, so maybe do this now:
if (quiltmode_splitbrain()) {
my $upstreamversion = $clogp->{Version};
@@ -3691,7 +3693,7 @@ sub quiltify ($$$$) {
sub build_maybe_quilt_fixup () {
my ($format,$fopts) = get_source_format;
- return unless madformat $format;
+ return unless madformat_wantfixup $format;
# sigh
check_for_vendor_patches();