[kernel] r11176 - in people/waldi/dkt: bin lib/dkt/bin

[Bastian Blank]

Author: waldi
Date: Fri Apr 25 14:22:51 2008
New Revision: 11176

Log:
bin/dkt-maintainer, lib/dkt/bin/base.py:
Modify itemconfigs instead of bootconfigs for removals.


Modified:
   people/waldi/dkt/bin/dkt-maintainer
   people/waldi/dkt/lib/dkt/bin/base.py

Modified: people/waldi/dkt/bin/dkt-maintainer
==============================================================================
--- people/waldi/dkt/bin/dkt-maintainer	(original)
+++ people/waldi/dkt/bin/dkt-maintainer	Fri Apr 25 14:22:51 2008
@@ -105,8 +105,9 @@
     def __call__(self):
         self.run_systemtask()
         self.run_imagetask()
-        self.bootconfig_generate()
-        self.bootconfig_delete(self.package)
+        itemconfigs = self.itemconfigs[:]
+        self.itemconfigs_delete(self.package, itemconfigs)
+        self.bootconfig_generate(itemconfigs)
         self.bootconfig_deploy()
 
 class MainImagePostRm(MainAllPostRm):

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	Fri Apr 25 14:22:51 2008
@@ -22,12 +22,6 @@
             self.itemconfigs.read_dir(dir)
         default_registry.run(IImageConfig, 'image_config', self.itemconfigs, self.config)
 
-    def bootconfig_delete(self, package):
-        for i in self.bootconfig:
-            for c in i.configs:
-                if IItemPackageConfig(c).name == self.package:
-                    self.bootconfig.remove(i)
-
     def bootconfig_deploy(self):
         # XXX
         ret = default_registry.run(IBootConfigDeploy, 'boot_config_deploy', self.bootconfig, self.config)
@@ -42,19 +36,23 @@
         bootconfig = default_registry.run(IBootConfigPartition, 'boot_config_partition', [bootconfig], self.config)
         self.bootconfig = default_registry.run(IBootConfigSort, 'boot_config_sort', bootconfig, self.config)
 
-    def itemconfig_get(self, package):
-        for i in self.itemconfigs.itervalues():
+    def itemconfig_get(self, package, itemconfigs = None):
+        if itemconfigs is None:
+            itemconfigs = self.itemconfigs
+        for i in itemconfigs.itervalues():
             try:
                 if IItemPackageConfig(i).name == package:
                     return i
             except TypeError: pass
         raise KeyError(package)
 
-    def itemconfig_delete(self, package):
-        for name, value in self.itemconfigs.iteritems():
+    def itemconfig_delete(self, package, itemconfigs = None):
+        if itemconfigs is None:
+            itemconfigs = self.itemconfigs
+        for name, value in itemconfigs.iteritems():
             try:
                 if IItemPackageConfig(name).name == package:
-                    del self.itemconfigs[name]
+                    del itemconfigs[name]
             except TypeError: pass
 
     def run_imagetask(self, type, *args):