From: david-sarah <david-sarah@jacaranda.org>
Date: Wed, 3 Aug 2011 16:38:48 +0000 (-0700)
Subject: Slightly improve error message about old config files (avoid unnecessary Unicode... 
X-Git-Url: https://git.rkrishnan.org/components/%22news.html/simplejson/decoder.py.html?a=commitdiff_plain;h=f45bfeb3df62df173f3a384719387882564aed5c;p=tahoe-lafs%2Ftahoe-lafs.git

Slightly improve error message about old config files (avoid unnecessary Unicode escaping). refs #1385
---

diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index a671d1df..2947044e 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -11,7 +11,7 @@ from allmydata.util import log
 from allmydata.util import fileutil, iputil, observer
 from allmydata.util.assertutil import precondition, _assert
 from allmydata.util.fileutil import abspath_expanduser_unicode
-from allmydata.util.encodingutil import get_filesystem_encoding
+from allmydata.util.encodingutil import get_filesystem_encoding, quote_output
 
 # Add our application versions to the data that Foolscap's LogPublisher
 # reports.
@@ -128,7 +128,8 @@ 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." % (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)