From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 17 May 2013 19:47:42 +0000 (+0100)
Subject: A missing basedir should cause an error if we try to read the config. refs #1971
X-Git-Url: https://git.rkrishnan.org/pf/module-simplejson.html?a=commitdiff_plain;h=57bbc61b36bc5ede98197c6a9f8bcf1d6c273e90;p=tahoe-lafs%2Ftahoe-lafs.git

A missing basedir should cause an error if we try to read the config. refs #1971

Signed-off-by: Daira Hopwood <david-sarah@jacaranda.org>
---

diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index 19e28ad1..384c75fa 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -130,6 +130,8 @@ class ConfigMixin:
         except EnvironmentError:
             if os.path.exists(tahoe_cfg):
                 raise
+            if not os.path.isdir(self.basedir):
+                raise MissingConfigEntry("%s is missing or not a directory." % quote_output(self.basedir))
 
     def error_about_old_config_files(self):
         """ If any old configuration files are detected, raise OldConfigError. """