--remote parameter requires a colon

[bup.git] / cmd / join-cmd.py

diff --git a/cmd/join-cmd.py b/cmd/join-cmd.py
index 81febac4b23c39b3cd3d973e93064eb9f477bd45..d2cc888cd3020a4404f62aaf37950d848d64077e 100755 (executable)
--- a/cmd/join-cmd.py
+++ b/cmd/join-cmd.py
@@ -20,7 +20,12 @@ if not extra:
 ret = 0
 
 if opt.remote:
-    cli = client.Client(opt.remote)
+    if opt.remote and opt.remote.find(":") == -1:
+        o.fatal("--remote argument must contain a colon")
+    try:
+        cli = client.Client(opt.remote)
+    except client.ClientError:
+        o.fatal("server exited unexpectedly; see errors above")
     cat = cli.cat
 else:
     cp = git.CatPipe()