]> arthur.barton.de Git - bup.git/commitdiff
get/init: consistently use argv_bytes() for RemoteRepo/Client
authorJohannes Berg <johannes@sipsolutions.net>
Tue, 14 Jan 2020 15:18:18 +0000 (16:18 +0100)
committerRob Browning <rlb@defaultvalue.org>
Thu, 16 Jan 2020 07:05:17 +0000 (01:05 -0600)
We should be using argv_bytes() here, since the parsing will
require using bytes later.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
cmd/get-cmd.py
cmd/init-cmd.py

index c2fc547112361d8010226bd2f5ec7043950e366a..a02f270627db5f787b292b051b69927c5480803a 100755 (executable)
@@ -578,6 +578,8 @@ def main():
         client.bwlimit = parse_num(opt.bwlimit)
     if is_reverse and opt.remote:
         misuse("don't use -r in reverse mode; it's automatic")
+    if opt.remote:
+        opt.remote = argv_bytes(opt.remote)
     if opt.remote or is_reverse:
         dest_repo = RemoteRepo(opt.remote)
     else:
index 412ecec1907e2f8b655acc356f1059b4d757419c..ad2ed82877ab2bc643ee070f0ad7c75b5e5e959b 100755 (executable)
@@ -10,6 +10,7 @@ import sys
 
 from bup import git, options, client
 from bup.helpers import log, saved_errors
+from bup.compat import argv_bytes
 
 
 optspec = """
@@ -32,5 +33,5 @@ except git.GitError as e:
 
 if opt.remote:
     git.check_repo_or_die()
-    cli = client.Client(opt.remote, create=True)
+    cli = client.Client(argv_bytes(opt.remote), create=True)
     cli.close()