From 00f2d311d806aa3585dbabfc2d66b797be3f2664 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Fri, 23 Dec 2011 21:24:34 +0100
Subject: little fixes

---
 README                        | 2 +-
 module/config/ConfigParser.py | 4 +++-
 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
-- 
cgit v1.2.3