X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=19745818079d2939ca95e68688c9006ccbe0d8f3;hb=e2c606b8a204d68f96047ebe3b21e7274839ea66;hp=f7f2b710b9732ae11b82a0b594b17301e56a26ad;hpb=f04599680685ea8f89bff8bc76e3dad2f8028081;p=dgit.git

diff --git a/dgit b/dgit
index f7f2b710..19745818 100755
--- a/dgit
+++ b/dgit
@@ -70,7 +70,6 @@ our $overwrite_version; # undef: not specified; '': check changelog
 our $quilt_mode;
 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
 our $dodep14tag;
-our $dodep14tag_re = 'want|no|always';
 our $split_brain_save;
 our $we_are_responder;
 our $we_are_initiator;
@@ -156,6 +155,7 @@ our $split_brain = 0;
 
 END {
     local ($@, $?);
+    return unless forkcheck_mainprocess();
     print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
 }
 
@@ -220,6 +220,7 @@ initdebug('');
 our @end;
 END { 
     local ($?);
+    return unless forkcheck_mainprocess();
     foreach my $f (@end) {
 	eval { $f->(); };
 	print STDERR "$us: cleanup: $@" if length $@;
@@ -4473,7 +4474,10 @@ sub i_cleanup {
     }
 }
 
-END { i_cleanup(); }
+END {
+    return unless forkcheck_mainprocess();
+    i_cleanup();
+}
 
 sub i_method {
     my ($base,$selector,@args) = @_;
@@ -6252,7 +6256,9 @@ sub cmd_version {
 }
 
 our (%valopts_long, %valopts_short);
+our (%funcopts_long);
 our @rvalopts;
+our (@modeopt_cfgs);
 
 sub defvalopt ($$$$) {
     my ($long,$short,$val_re,$how) = @_;
@@ -6288,6 +6294,26 @@ defvalopt '--initiator-tempdir','','.*', sub {
 	" absolute, not relative, directory."
 };
 
+sub defoptmodes ($@) {
+    my ($varref, $cfgkey, $default, %optmap) = @_;
+    my %permit;
+    while (my ($opt,$val) = each %optmap) {
+	$funcopts_long{$opt} = sub { $$varref = $val; };
+	$permit{$val} = $val;
+    }
+    push @modeopt_cfgs, {
+        Var => $varref,
+        Key => $cfgkey,
+        Default => $default,
+        Vals => \%permit
+    };
+}
+
+defoptmodes \$dodep14tag, qw( dep14tag          want
+			      --dep14tag        want
+			      --no-dep14tag     no
+			      --always-dep14tag always );
+
 sub parseopts () {
     my $om;
 
@@ -6370,15 +6396,6 @@ sub parseopts () {
 	    } elsif (m/^--overwrite=(.+)$/s) {
 		push @ropts, $_;
 		$overwrite_version = $1;
-	    } elsif (m/^--dep14tag$/s) {
-		push @ropts, $_;
-		$dodep14tag= 'want';
-	    } elsif (m/^--no-dep14tag$/s) {
-		push @ropts, $_;
-		$dodep14tag= 'no';
-	    } elsif (m/^--always-dep14tag$/s) {
-		push @ropts, $_;
-		$dodep14tag= 'always';
 	    } elsif (m/^--delayed=(\d+)$/s) {
 		push @ropts, $_;
 		push @dput, $_;
@@ -6417,6 +6434,9 @@ sub parseopts () {
 	    } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
 		$val = $2 ? $' : undef; #';
 		$valopt->($oi->{Long});
+	    } elsif ($funcopts_long{$_}) {
+		push @ropts, $_;
+		$funcopts_long{$_}();
 	    } else {
 		badusage "unknown long option \`$_'";
 	    }
@@ -6549,12 +6569,14 @@ sub parseopts_late_defaults () {
 	$quilt_mode = $1;
     }
 
-    if (!defined $dodep14tag) {
+    foreach my $moc (@modeopt_cfgs) {
 	local $access_forpush;
-	$dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
-	$dodep14tag =~ m/^($dodep14tag_re)$/ 
-	    or badcfg "unknown dep14tag setting \`$dodep14tag'";
-	$dodep14tag = $1;
+	my $vr = $moc->{Var};
+	next if defined $$vr;
+	$$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
+	my $v = $moc->{Vals}{$$vr};
+	badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
+	$$vr = $v;
     }
 
     $need_split_build_invocation ||= quiltmode_splitbrain();