X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fconfig.py;h=9993ec3adbfb3bb2d61c4168d726e72eb7bc5cad;hb=4830d9be143c7645ea932b53fae095e275ad7814;hp=997a597d0e499e593684efa83b137a75db7f1d3a;hpb=2ae7b715431fed62b6a619e6d1b027d919da1070;p=dak.git

diff --git a/daklib/config.py b/daklib/config.py
index 997a597d..9993ec3a 100755
--- a/daklib/config.py
+++ b/daklib/config.py
@@ -28,36 +28,49 @@ Config access class
 
 ################################################################################
 
+import os
 import apt_pkg
 import socket
 
-from singleton import Singleton
-
 ################################################################################
 
-default_config = "/etc/dak/dak.conf"
+default_config = "/etc/dak/dak.conf" #: default dak config, defines host properties
+
+# suppress some deprecation warnings in squeeze related to apt_pkg
+# module
+import warnings
+warnings.filterwarnings('ignore', \
+    "Attribute '.*' of the 'apt_pkg\.Configuration' object is deprecated, use '.*' instead\.", \
+    DeprecationWarning)
+warnings.filterwarnings('ignore', \
+    "apt_pkg\.newConfiguration\(\) is deprecated\. Use apt_pkg\.Configuration\(\) instead\.", \
+    DeprecationWarning)
 
-def which_conf_file(Cnf):
-    res = socket.gethostbyaddr(socket.gethostname())
-    if Cnf.get("Config::" + res[0] + "::DakConfig"):
-        return Cnf["Config::" + res[0] + "::DakConfig"]
-    else:
-        return default_config
+def which_conf_file():
+    return os.getenv("DAK_CONFIG", default_config)
 
-class Config(Singleton):
+class Config(object):
     """
     A Config object is a singleton containing
     information about the DAK configuration
     """
+
+    __shared_state = {}
+
     def __init__(self, *args, **kwargs):
-        super(Config, self).__init__(*args, **kwargs)
+        self.__dict__ = self.__shared_state
+
+        if not getattr(self, 'initialised', False):
+            self.initialised = True
+            self._readconf()
+            self._setup_routines()
 
     def _readconf(self):
         apt_pkg.init()
 
         self.Cnf = apt_pkg.newConfiguration()
 
-        apt_pkg.ReadConfigFileISC(self.Cnf, default_config)
+        apt_pkg.ReadConfigFileISC(self.Cnf, which_conf_file())
 
         # Check whether our dak.conf was the real one or
         # just a pointer to our main one
@@ -71,9 +84,8 @@ class Config(Singleton):
         self.get = self.Cnf.get
         self.SubTree = self.Cnf.SubTree
         self.ValueList = self.Cnf.ValueList
-
-    def _startup(self, *args, **kwargs):
-        self._readconf()
+        self.Find = self.Cnf.Find
+        self.FindB = self.Cnf.FindB
 
     def has_key(self, name):
         return self.Cnf.has_key(name)
@@ -81,3 +93,44 @@ class Config(Singleton):
     def __getitem__(self, name):
         return self.Cnf[name]
 
+    def __setitem__(self, name, value):
+        self.Cnf[name] = value
+
+    @staticmethod
+    def get_db_value(name, default=None, rettype=None):
+        from daklib.dbconn import DBConfig, DBConn, NoResultFound
+        try:
+            res = DBConn().session().query(DBConfig).filter(DBConfig.name == name).one()
+        except NoResultFound:
+            return default
+
+        if rettype:
+            return rettype(res.value)
+        else:
+            return res.value
+
+    def _setup_routines(self):
+        """
+        This routine is the canonical list of which fields need to exist in
+        the config table.  If your dak instance is to work, we suggest reading it
+
+        Of course, what the values do is another matter
+        """
+        for field in [('db_revision',      None,       int),
+                      ('defaultsuitename', 'unstable', str),
+                      ('signingkeyids',    '',         str),
+                      ('exportpath',       '',         str)
+                      ]:
+            setattr(self, 'get_%s' % field[0], lambda s=None, x=field[0], y=field[1], z=field[2]: self.get_db_value(x, y, z))
+            setattr(Config, '%s' % field[0], property(fget=getattr(self, 'get_%s' % field[0])))
+
+    def get_defaultsuite(self):
+        from daklib.dbconn import get_suite
+        suitename = self.defaultsuitename
+        if not suitename:
+            return None
+        else:
+            return get_suite(suitename)
+
+    defaultsuite = property(get_defaultsuite)
+