commit a90ede962f9466f1019f36cc3d0038cd170be671 Author: Damian Johnson <atagar@torproject.org> Date: Tue Jul 5 14:35:39 2011 -0700 fix: extra slash in fallback conf desc path The prefix path used for fallback configuration descriptions already ended with a slash, so the resulting path had an extra... <prefix>//resources/torConfigDesc.txt this didn't harm anything but might as well be corrected. --- src/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 1b6049a..234bf16 100644 --- a/src/starter.py +++ b/src/starter.py @@ -168,7 +168,7 @@ def _loadConfigurationDescriptions(pathPrefix): if not isConfigDescriptionsLoaded: try: loadStartTime = time.time() - loadedVersion = util.torConfig.loadOptionDescriptions(pathPrefix + "/resources/" + CONFIG_DESC_FILENAME, False) + loadedVersion = util.torConfig.loadOptionDescriptions("%sresources/%s" % (pathPrefix, CONFIG_DESC_FILENAME), False) isConfigDescriptionsLoaded = True msg = DESC_INTERNAL_LOAD_SUCCESS_MSG % loadedVersion