From: David Stainton Date: Mon, 19 Oct 2015 12:14:32 +0000 (+0200) Subject: Use argv_to_abspath for magic-folder join file path arg X-Git-Url: https://git.rkrishnan.org/vdrive/global?a=commitdiff_plain;h=af5d958279628e241f34e59f294aa47590c0a7f7;p=tahoe-lafs%2Ftahoe-lafs.git Use argv_to_abspath for magic-folder join file path arg --- diff --git a/src/allmydata/scripts/magic_folder_cli.py b/src/allmydata/scripts/magic_folder_cli.py index 14ba2ca6..5356ce8b 100644 --- a/src/allmydata/scripts/magic_folder_cli.py +++ b/src/allmydata/scripts/magic_folder_cli.py @@ -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.")