Teach join to also check for existing magicfolder db file

This commit is contained in:
David Stainton 2015-11-05 17:09:17 +01:00 committed by Brian Warner
parent aea2cf2890
commit 8ff7642fba

View File

@ -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)