[kernel] r10705 - in people/waldi/dkt/lib/dkt: bin hooks/modules imageconfig

[Bastian Blank]

Author: waldi
Date: Wed Mar  5 11:25:04 2008
New Revision: 10705

Log:
* lib/dkt/bin/base.py: Convert config correctly.
* lib/dkt/hooks/modules/backward_config_boot.py,
  lib/dkt/hooks/modules/backward_symlinks.py: Fix.
* lib/dkt/imageconfig/list.py: Add plain Config objects to list.


Modified:
   people/waldi/dkt/lib/dkt/bin/base.py
   people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
   people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
   people/waldi/dkt/lib/dkt/imageconfig/list.py

Modified: people/waldi/dkt/lib/dkt/bin/base.py
==============================================================================
--- people/waldi/dkt/lib/dkt/bin/base.py	(original)
+++ people/waldi/dkt/lib/dkt/bin/base.py	Wed Mar  5 11:25:04 2008
@@ -1,6 +1,7 @@
 from dkt.hooks import default_registry
 from dkt.hooks.interfaces import *
 from dkt.imageconfig.list import ImageConfigList
+from dkt.imageconfig.interfaces import IImageBaseConfig
 from dkt.systemconfig.file import SystemConfig
 from dkt.systemconfig.defaults import CONFIG_FILE, IMAGECONFIG_DIRS
 
@@ -30,7 +31,7 @@
 
     def imageconfig_get(self, package):
         for i in self.imageconfigs.itervalues():
-            if i.package == package:
+            if IImageBaseConfig(i).package == package:
                 return i
         raise KeyError(package)
 

Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
==============================================================================
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py	(original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py	Wed Mar  5 11:25:04 2008
@@ -3,6 +3,7 @@
 from dkt.config.base import MutableConfig
 from dkt.config.interfaces import IMutableConfig
 from dkt.hooks import default_registry, interfaces, register
+from dkt.imageconfig.interfaces import IImageBaseConfig
 
 class Hook(object):
     def _add_config(self, configs, version, data):
@@ -35,7 +36,7 @@
         image_file = data[0]
 
         for l in configs.itervalues():
-            if l.file == image_file:
+            if IImageBaseConfig(l).file == image_file:
                 return self._update_config(l, data)
 
         return self._add_config(configs, version, data)
@@ -43,7 +44,7 @@
     def _update_config(self, config, data):
         symlinks_data = data[2]
 
-        config = IMutableConfig(config.get_config())
+        config = IMutableConfig(config)
 
         if symlinks_data is not None:
             config.add_section('backward-compatibility')

Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
==============================================================================
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py	(original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py	Wed Mar  5 11:25:04 2008
@@ -6,7 +6,7 @@
         return systemconfig.get_parse_boolean('backward-compatibility', 'kpkg-do-symlinks', False)
 
     def _set_config(self, imageconfig, name, value):
-        config = IMutableConfig(imageconfig.get_config())
+        config = IMutableConfig(imageconfig)
         config.add_section('backward-compatibility')
         config.set('backward-compatibility', name, value)
 

Modified: people/waldi/dkt/lib/dkt/imageconfig/list.py
==============================================================================
--- people/waldi/dkt/lib/dkt/imageconfig/list.py	(original)
+++ people/waldi/dkt/lib/dkt/imageconfig/list.py	Wed Mar  5 11:25:04 2008
@@ -1,14 +1,12 @@
 import os
 
 from dkt.config.file import MutableConfig
-from dkt.imageconfig.base import ImageBaseConfig
+from dkt.imageconfig.interfaces import IImageBaseConfig
 
 class ImageConfigList(dict):
     def add(self, name, value):
-        config = ImageBaseConfig._factory(value)
-        if config is None:
-            raise ValueError
-        self[name] = config
+        IImageBaseConfig(value)
+        self[name] = value
 
     def read_dir(self, dir):
         for root, dirs, files in os.walk(dir):
@@ -18,10 +16,9 @@
     def read_file(self, filename, name):
         # XXX: Makes the main config mutable
         config = MutableConfig(file(filename))
-        config = ImageBaseConfig._factory(config)
-        if config is not None:
-            self[name] = config
-        else:
+        try:
+            self.add(name, config)
+        except:
             # XXX
             pass