Merge commit 'stew/contents' into merge

[dak.git] / daklib / config.py

diff --git a/daklib/config.py b/daklib/config.py
index f7f270f085e57416c8f29229017d9358bb0799da..c2d2fe5506c675682db0de4b464d310ca2d2fa82 100755 (executable)
--- a/daklib/config.py
+++ b/daklib/config.py
@@ -35,7 +35,7 @@ from singleton import Singleton
 
 ################################################################################
 
-default_config = "/etc/dak/dak.conf"
+default_config = "/etc/dak/dak.conf" #: default dak config, defines host properties
 
 def which_conf_file(Cnf):
     res = socket.gethostbyaddr(socket.gethostname())
@@ -71,6 +71,8 @@ class Config(Singleton):
         self.get = self.Cnf.get
         self.SubTree = self.Cnf.SubTree
         self.ValueList = self.Cnf.ValueList
+        self.Find = self.Cnf.Find
+        self.FindB = self.Cnf.FindB
 
     def _startup(self, *args, **kwargs):
         self._readconf()
@@ -78,12 +80,8 @@ class Config(Singleton):
     def has_key(self, name):
         return self.Cnf.has_key(name)
 
-    def Find(self, *args, **kwargs):
-        return self.Cnf.Find(*args, **kwargs)
-
-    def FindB(self, *args, **kwargs):
-        return self.Cnf.FindB(*args, **kwargs)
-
     def __getitem__(self, name):
         return self.Cnf[name]
 
+    def __setitem__(self, name, value):
+        self.Cnf[name] = value