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

[Bastian Blank]

Author: waldi
Date: Wed Apr 23 07:58:42 2008
New Revision: 11124

Log:
bin/dkt-maintainer, lib/dkt/bin/base.py: Rename imageconfig to itemconfig.


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	Wed Apr 23 07:58:42 2008
@@ -72,14 +72,14 @@
         super(MainImagePostInst, self).__init__(*args)
 
         try:
-            self.imageconfig = self.imageconfig_get(self.package)
+            self.itemconfig = self.itemconfig_get(self.package)
         except KeyError:
             sys.stderr.write("Can't find image config for package %s\n" % self.package)
             sys.exit(1)
 
     def __call__(self):
         self.run_systemtask()
-        self.run_imagetask('postinst', self.imageconfig, (self.command,) + self.args)
+        self.run_imagetask('postinst', self.itemconfig, (self.command,) + self.args)
         self.bootconfig_generate()
         self.bootconfig_deploy()
 
@@ -88,14 +88,14 @@
         super(MainImagePreRm, self).__init__(*args)
 
         try:
-            self.imageconfig = self.imageconfig_get(self.package)
+            self.itemconfig = self.itemconfig_get(self.package)
         except KeyError:
             sys.stderr.write("Can't find image config for package %s\n" % self.package)
             sys.exit(1)
 
     def __call__(self):
         self.run_systemtask()
-        self.run_imagetask('prerm', self.imageconfig, (self.command,) + self.args)
+        self.run_imagetask('prerm', self.itemconfig, (self.command,) + self.args)
         self.bootconfig_generate()
         self.bootconfig_delete(self.package)
         self.bootconfig_deploy()

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 Apr 23 07:58:42 2008
@@ -46,10 +46,10 @@
                 return i
         raise KeyError(package)
 
-    def imageconfig_delete(self, package):
-        for name, value in self.imageconfigs.iteritems():
+    def itemconfig_delete(self, package):
+        for name, value in self.itemconfigs.iteritems():
             if IItemPackageConfig(name).name == package:
-                del self.imageconfigs[name]
+                del self.itemconfigs[name]
 
     def run_imagetask(self, type, *args):
         return default_registry.run(IImageTask, 'image_' + type, self.config, *args)
@@ -58,5 +58,5 @@
         return default_registry.run(IModulesTask, 'modules_' + type, self.config, *args)
 
     def run_systemtask(self, type):
-        return default_registry.run(ISystemTask, 'system_' + type, self.config, self.imageconfigs)
+        return default_registry.run(ISystemTask, 'system_' + type, self.config, self.itemconfigs)