diff options
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -1519,6 +1519,15 @@ sub access_cfg_tagformats () { split /\,/, access_cfg('dgit-tag-format'); } +sub access_cfg_tagformats_can_splitbrain () { + my %y = map { $_ => 1 } access_cfg_tagformats; + foreach my $needtf (qw(new maint)) { + next if $y{$needtf}; + return 0; + } + return 1; +} + sub need_tagformat ($$) { my ($fmt, $why) = @_; fail "need to use tag format $fmt ($why) but also need". @@ -4912,13 +4921,10 @@ sub build_maybe_quilt_fixup () { check_for_vendor_patches(); if (quiltmode_splitbrain) { - foreach my $needtf (qw(new maint)) { - next if grep { $_ eq $needtf } access_cfg_tagformats; - fail <<END + fail <<END unless access_cfg_tagformats_can_splitbrain; quilt mode $quilt_mode requires split view so server needs to support both "new" and "maint" tag formats, but config says it doesn't. END - } } my $clogp = parsechangelog(); |