'mergechanges' => \@mergechanges);
our %opts_opt_cmdonly = ('gpg' => 1);
+our %opts_opt_cmdline_opts;
+sub finalise_opts_opts();
our $keyid;
Push failed, before we got started.
You can retry the push, after fixing the problem, if you like.
END
+ finalise_opts_opts();
+}
+
+sub notpushing () {
+ finalise_opts_opts();
}
sub supplementary_message ($) {
@l;
}
-sub access_cfg (@) {
+sub access_cfg_cfgs (@) {
my (@keys) = @_;
my @cfgs;
# The nesting of these loops determines the search order. We put
}
push @cfgs, map { "dgit.default.$_" } @realkeys;
push @cfgs, @rundef;
+ return @cfgs;
+}
+
+sub access_cfg (@) {
+ my (@keys) = @_;
+ my (@cfgs) = access_cfg_cfgs(@keys);
my $value = cfg(@cfgs);
return $value;
}
sub cmd_clone {
parseopts();
+ notpushing();
my $dstdir;
badusage "-p is not allowed with clone; specify as argument instead"
if defined $package;
}
sub fetchpullargs () {
+ notpushing();
if (!defined $package) {
my $sourcep = parsecontrol('debian/control','debian/control');
$package = getfield $sourcep, 'Source';
}
sub cmd_push {
- pushing();
parseopts();
+ pushing();
badusage "-p is not allowed with dgit push" if defined $package;
check_not_dirty();
my $clogp = parsechangelog();
sub cmd_clean () {
badusage "clean takes no additional arguments" if @ARGV;
+ notpushing();
clean_tree();
}
sub build_prep () {
+ notpushing();
badusage "-p is not allowed when building" if defined $package;
check_not_dirty();
clean_tree();
!$opts_opt_cmdonly{$1} &&
($om = $opts_opt_map{$1})) {
push @ropts, $_;
- push @$om, $2;
+ push @{ $opts_opt_cmdline_opts{$1} }, $2;
} elsif (m/^--existing-package=(.*)/s) {
push @ropts, $_;
$existing_package = $1;
}
}
+sub finalise_opts_opts () {
+ foreach my $k (keys %opts_opt_cmdline_opts) {
+ push @{ $opts_opt_map{$k} }, @{ $opts_opt_cmdline_opts{$k} };
+ }
+}
+
if ($ENV{$fakeeditorenv}) {
quilt_fixup_editor();
}