From: david-sarah <david-sarah@jacaranda.org>
Date: Wed, 3 Aug 2011 17:45:46 +0000 (-0700)
Subject: Further improve error message about old config files. refs #1385
X-Git-Url: https://git.rkrishnan.org/pf/content/en/service/sitemap.html?a=commitdiff_plain;h=80300ea7a3c582ea9abd8b321930c1a241c7ff2e;p=tahoe-lafs%2Ftahoe-lafs.git

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

diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index 2947044e..f73239f2 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -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)