ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 07:06:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further improve error message about old config files. refs #1385

Browse Source
This commit is contained in:
david-sarah 2011-08-03 10:45:46 -07:00
parent f45bfeb3df
commit 80300ea7a3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/node.py
View File

@ -46,6 +46,12 @@ class MissingConfigEntry(Exception):
class OldConfigError(Exception):
""" An obsolete config file was found. See
docs/historical/configuration.rst. """
def __str__(self):
return ("Found pre-Tahoe-LAFS-v1.3 configuration file(s):\n"
"%s\n"
"See docs/historical/configuration.rst."
% "\n".join([quote_output(fname) for fname in self.args[0]]))
class Node(service.MultiService):
# this implements common functionality of both Client nodes and Introducer
@ -128,11 +134,11 @@ class Node(service.MultiService):
if name not in self.GENERATED_FILES:
fullfname = os.path.join(self.basedir, name)
if os.path.exists(fullfname):
log.err("Found pre-Tahoe-LAFS-v1.3 configuration file: %s. "
"See docs/historical/configuration.rst." % quote_output(fullfname))
oldfnames.add(fullfname)
if oldfnames:
raise OldConfigError(oldfnames)
e = OldConfigError(oldfnames)
twlog.msg(e)
raise e
def create_tub(self):
certfile = os.path.join(self.basedir, "private", self.CERTFILE)