dgit: Option parsing: Move pushing call in push

[dgit.git] / dgit

diff --git a/dgit b/dgit
index d62694a90818c7d461324381f57a3eb4d6b3afc2..cd249b4226ada31ea2ae56a2e593a4c1cf5b715e 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -73,6 +73,7 @@ our $dodep14tag;
 our $dodep14tag_re = 'want|no|always';
 our $split_brain_save;
 our $we_are_responder;
+our $we_are_initiator;
 our $initiator_tempdir;
 our $patches_applied_dirtily = 00;
 our $tagformat_want;
@@ -4332,7 +4333,6 @@ END
 
 sub cmd_push {
     parseopts();
-    pushing();
     badusage "-p is not allowed with dgit push" if defined $package;
     check_not_dirty();
     my $clogp = parsechangelog();
@@ -4345,6 +4345,7 @@ sub cmd_push {
        badusage "incorrect arguments to dgit push";
     }
     $isuite = getfield $clogp, 'Distribution';
+    pushing();
     if ($new_package) {
        local ($package) = $existing_package; # this is a hack
        canonicalise_suite();
@@ -4457,6 +4458,8 @@ sub cmd_rpush {
     my @cmd = (@ssh, $host, shellquote @rdgit);
     debugcmd "+",@cmd;
 
+    $we_are_initiator=1;
+
     if (defined $initiator_tempdir) {
        rmtree $initiator_tempdir;
        mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";