From: David Stainton Date: Thu, 5 Nov 2015 16:09:17 +0000 (+0100) Subject: Teach join to also check for existing magicfolder db file X-Git-Url: https://git.rkrishnan.org/%5B/frontends/flags/index.php?a=commitdiff_plain;h=d596d07642235bc212b737f3bde6ce0ea4241d49;p=tahoe-lafs%2Ftahoe-lafs.git Teach join to also check for existing magicfolder db file --- diff --git a/src/allmydata/scripts/magic_folder_cli.py b/src/allmydata/scripts/magic_folder_cli.py index 245a9b6a..7b63a70d 100644 --- a/src/allmydata/scripts/magic_folder_cli.py +++ b/src/allmydata/scripts/magic_folder_cli.py @@ -152,8 +152,9 @@ def join(options): dmd_cap_file = os.path.join(options["node-directory"], u"private", u"magic_folder_dircap") collective_readcap_file = os.path.join(options["node-directory"], u"private", u"collective_dircap") + magic_folder_db_file = os.path.join(options["node-directory"], u"private", u"magicfolderdb.sqlite") - if os.path.exists(dmd_cap_file) or os.path.exists(collective_readcap_file): + if os.path.exists(dmd_cap_file) or os.path.exists(collective_readcap_file) or os.path.exists(magic_folder_db_file): raise usage.UsageError("Cannot join. Already joined.") fileutil.write(dmd_cap_file, dmd_write_cap)