From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Jan 2017 16:31:58 +0000 (+0000)
Subject: dgit: Option parsing: Make function parseopts_late_defaults
X-Git-Tag: archive/debian/3.0~86
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=1d34fdab75a2cab04ee30c10f6bcd32f02620b17

dgit: Option parsing: Make function parseopts_late_defaults

No functional change.

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

diff --git a/dgit b/dgit
index d2da0f13..5207e0b9 100755
--- a/dgit
+++ b/dgit
@@ -6313,40 +6313,44 @@ $cmd =~ y/-/_/;
 my $pre_fn = ${*::}{"pre_$cmd"};
 $pre_fn->() if $pre_fn;
 
-if (!defined $rmchanges) {
-    local $access_forpush;
-    $rmchanges = access_cfg_bool(0, 'rm-old-changes');
-}
+sub parseopts_late_defaults () {
+    if (!defined $rmchanges) {
+	local $access_forpush;
+	$rmchanges = access_cfg_bool(0, 'rm-old-changes');
+    }
 
-if (!defined $quilt_mode) {
-    local $access_forpush;
-    $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
-	// access_cfg('quilt-mode', 'RETURN-UNDEF')
-	// 'linear';
-    $quilt_mode =~ m/^($quilt_modes_re)$/ 
-	or badcfg "unknown quilt-mode \`$quilt_mode'";
-    $quilt_mode = $1;
-}
+    if (!defined $quilt_mode) {
+	local $access_forpush;
+	$quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
+	    // access_cfg('quilt-mode', 'RETURN-UNDEF')
+	    // 'linear';
+	$quilt_mode =~ m/^($quilt_modes_re)$/ 
+	    or badcfg "unknown quilt-mode \`$quilt_mode'";
+	$quilt_mode = $1;
+    }
 
-if (!defined $dodep14tag) {
-    local $access_forpush;
-    $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
-    $dodep14tag =~ m/^($dodep14tag_re)$/ 
-	or badcfg "unknown dep14tag setting \`$dodep14tag'";
-    $dodep14tag = $1;
-}
+    if (!defined $dodep14tag) {
+	local $access_forpush;
+	$dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
+	$dodep14tag =~ m/^($dodep14tag_re)$/ 
+	    or badcfg "unknown dep14tag setting \`$dodep14tag'";
+	$dodep14tag = $1;
+    }
 
-$need_split_build_invocation ||= quiltmode_splitbrain();
+    $need_split_build_invocation ||= quiltmode_splitbrain();
 
-if (!defined $cleanmode) {
-    local $access_forpush;
-    $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
-    $cleanmode //= 'dpkg-source';
+    if (!defined $cleanmode) {
+	local $access_forpush;
+	$cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
+	$cleanmode //= 'dpkg-source';
 
-    badcfg "unknown clean-mode \`$cleanmode'" unless
-	$cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
+	badcfg "unknown clean-mode \`$cleanmode'" unless
+	    $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
+    }
 }
 
+parseopts_late_defaults();
+
 my $fn = ${*::}{"cmd_$cmd"};
 $fn or badusage "unknown operation $cmd";
 $fn->();