From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 28 Jun 2019 11:06:39 +0000 (+0100)
Subject: dgit: Tidying up after tag format: drop ..._can_splitbrain
X-Git-Tag: archive/debian/9.0~106
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f3c951ed41114f3a8f3e5c991bd80d22986bb05a;p=dgit.git

dgit: Tidying up after tag format: drop ..._can_splitbrain

Substitute this fixed value into its call sites.  No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index b95cb57c..46a7ffc7 100755
--- a/dgit
+++ b/dgit
@@ -1677,13 +1677,6 @@ sub archive_query_dummycat ($$) {
 sub file_in_archive_dummycat () { return undef; }
 sub package_not_wholly_new_dummycat () { return undef; }
 
-#---------- tag format handling ----------
-# (untranslated, because everything should be new tag format by now)
-
-sub access_cfg_tagformats_can_splitbrain () {
-    1
-}
-
 #---------- archive query entrypoints and rest of program ----------
 
 sub canonicalise_suite () {
@@ -4278,13 +4271,9 @@ sub push_tagwants ($$$$) {
             View => 'maint',
         };
     } elsif ($dodep14tag eq 'no' ? 0
-	     : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
-	     : $dodep14tag eq 'always'
-	     ? (access_cfg_tagformats_can_splitbrain or fail <<END)
---dep14tag-always (or equivalent in config) means server must support
- both "new" and "maint" tag formats, but config says it doesn't.
-END
-	    : die "$dodep14tag ?") {
+	     : $dodep14tag eq 'want' ? 1
+	     : $dodep14tag eq 'always' ? 1
+	     : die "$dodep14tag ?") {
 	push @tagwants, {
 	    TagFn => \&debiantag_maintview,
 	    Objid => $dgithead,
@@ -5822,13 +5811,6 @@ sub build_maybe_quilt_fixup () {
 
 sub build_check_quilt_splitbrain () {
     build_maybe_quilt_fixup();
-
-    if ($do_split_brain) {
-	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
-    }
 }
 
 sub unpack_playtree_need_cd_work ($) {