summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-08-10 21:26:39 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-08-10 21:31:20 +0100
commit5ee107579037882ae549f35e9bc1b30e0acdb1ab (patch)
treea7b0b5ff5fb0ec1c4cbf220eb0026f45000ef71f /dgit
parent3e9f3deb5b383ee4580227beb5c77c19bdb5b122 (diff)
Check for rpush protocol version incompatibility and crash early if incompatible.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit24
1 files changed, 19 insertions, 5 deletions
diff --git a/dgit b/dgit
index 4095387..53ca56c 100755
--- a/dgit
+++ b/dgit
@@ -34,6 +34,8 @@ use Config;
our $our_version = 'UNRELEASED'; ###substituted###
+our $rpushprotovsn = 2;
+
our $isuite = 'unstable';
our $idistro;
our $package;
@@ -1727,12 +1729,15 @@ sub cmd_push {
#---------- remote commands' implementation ----------
-sub cmd_remote_push_responder {
+sub cmd_remote_push_build_host {
my ($nrargs) = shift @ARGV;
my (@rargs) = @ARGV[0..$nrargs-1];
@ARGV = @ARGV[$nrargs..$#ARGV];
die unless @rargs;
- my ($dir) = @rargs;
+ my ($dir,$vsnwant) = @rargs;
+ # vsnwant is a comma-separated list; we report which we have
+ # chosen in our ready response (so other end can tell if they
+ # offered several)
$debugprefix = ' ';
$we_are_responder = 1;
@@ -1743,12 +1748,21 @@ sub cmd_remote_push_responder {
open STDOUT, ">&STDERR" or die $!;
autoflush STDOUT 1;
- responder_send_command("dgit-remote-push-ready");
+ $vsnwant //= 1;
+ fail "build host has dgit rpush protocol version".
+ " $rpushprotovsn but invocation host has $vsnwant"
+ unless grep { $rpushprotovsn eq $_ } split /,/, $vsnwant;
+
+ responder_send_command("dgit-remote-push-ready $rpushprotovsn");
changedir $dir;
&cmd_push;
}
+sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
+# ... for compatibility with proto vsn.1 dgit (just so that user gets
+# a good error message)
+
our $i_tmp;
sub i_cleanup {
@@ -1784,11 +1798,11 @@ sub cmd_rpush {
$dir = nextarg;
}
$dir =~ s{^-}{./-};
- my @rargs = ($dir);
+ my @rargs = ($dir,$rpushprotovsn);
my @rdgit;
push @rdgit, @dgit;
push @rdgit, @ropts;
- push @rdgit, qw(remote-push-responder), (scalar @rargs), @rargs;
+ push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
push @rdgit, @ARGV;
my @cmd = (@ssh, $host, shellquote @rdgit);
printcmd \*DEBUG,$debugprefix."+",@cmd;