summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README2
-rw-r--r--module/config/ConfigParser.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/README b/README
index 7f3c4f4c8..324d8457d 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ Required
- pycurl a.k.a python-curl
- jinja2
- beaker
-- thrift
+- thrift >= 0.8
- simplejson (for python 2.5)
Some plugins require additional packages, only install these when needed.
diff --git a/module/config/ConfigParser.py b/module/config/ConfigParser.py
index 1d3ae87d6..82c6a9f91 100644
--- a/module/config/ConfigParser.py
+++ b/module/config/ConfigParser.py
@@ -5,7 +5,7 @@ from time import sleep
from os.path import exists
from gettext import gettext
-from module.utils import chmod, decode
+from module.utils import chmod
CONF_VERSION = 2
@@ -206,6 +206,8 @@ class ConfigParser:
if base:
if section not in self.baseSections: self.baseSections.append(section)
+ elif section in self.baseSections:
+ return # would overwrite base section
data = SectionTuple(gettext(name), gettext(desc), gettext(long_desc), d)
self.config[section] = data