From: Daira Hopwood <david-sarah@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/frontends/simplejson/decoder.py.html?a=commitdiff_plain;h=5800e5e5b2b0bb3583a9fbec780f5e03543e33fe;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 5811c32e..c24dd084 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -109,6 +109,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. """