mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-02-21 02:01:31 +00:00
Teach join to also check for existing magicfolder db file
This commit is contained in:
parent
aea2cf2890
commit
8ff7642fba
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user