Use argv_to_abspath for magic-folder join file path arg
authorDavid Stainton <dstainton415@gmail.com>
Mon, 19 Oct 2015 12:14:32 +0000 (14:14 +0200)
committerDaira Hopwood <daira@jacaranda.org>
Mon, 25 Jan 2016 15:48:13 +0000 (15:48 +0000)
src/allmydata/scripts/magic_folder_cli.py

index 14ba2ca610558de549d0852b9bf375bdd3fb2b09..5356ce8b35a36bf33e7652af54c79f0e4e7f48df 100644 (file)
@@ -6,6 +6,7 @@ from twisted.python import usage
 from .common import BaseOptions, BasedirOptions, get_aliases
 from .cli import MakeDirectoryOptions, LnOptions, CreateAliasOptions
 import tahoe_mv
+from allmydata.util.encodingutil import argv_to_abspath
 from allmydata.util import fileutil
 from allmydata import uri
 
@@ -123,7 +124,7 @@ class JoinOptions(BasedirOptions):
     magic_readonly_cap = ""
     def parseArgs(self, invite_code, local_dir):
         BasedirOptions.parseArgs(self)
-        self.local_dir = local_dir
+        self.local_dir = argv_to_abspath(str(local_dir))
         fields = invite_code.split(INVITE_SEPARATOR)
         if len(fields) != 2:
             raise usage.UsageError("Invalid invite code.")