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

[Bastian Blank]

Author: waldi
Date: Tue Feb 19 17:43:17 2008
New Revision: 10608

Log:
bin/dkt-maintainer, lib/dkt/bin/base.py: Update.


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	Tue Feb 19 17:43:17 2008
@@ -10,7 +10,7 @@
         self.package, self.version = package, version
 
         try:
-            self.imageconfig = self.get_imageconfig(package)
+            self.imageconfig = self.imageconfig_get(package)
         except KeyError:
             sys.stderr.write("Can't find image config for package %s\n" % self.package)
             sys.exit(1)
@@ -30,7 +30,7 @@
 
 class MainAllPostInst(MainAll):
     def __init__(self, package, version, command, *args):
-        super(MainAllPreInst, self).__init__(package, version)
+        super(MainAllPostInst, self).__init__(package, version)
         self.command, self.args = command, args
 
         if self.command not in ('configure', 'abort-upgrade', 'abort-remove', 'abort-deconfigure'):

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	Tue Feb 19 17:43:17 2008
@@ -11,10 +11,9 @@
 
         self.config = SystemConfig(file(config_file))
 
-        self._read_imageconfigs()
-        print self.imageconfigs
+        self._imageconfigs_read()
 
-    def _read_imageconfigs(self):
+    def _imageconfigs_read(self):
         # XXX
         dirs = IMAGECONFIG_DIRS
         self.imageconfigs = ImageConfigList()
@@ -22,22 +21,22 @@
             self.imageconfigs.read_dir(dir)
         default_registry.run(IImageConfig, 'image_config', self.imageconfigs, self.config)
 
-    def generate_bootconfig(self):
+    def bootconfig_generate(self):
         # XXX
         bootconfig = None
         bootconfig = default_registry.run(IBootConfigPrepare, 'boot_config_prepare', bootconfig, self.config, self.imageconfigs)
         bootconfig = default_registry.run(IBootConfigPartition, 'boot_config_partition', bootconfig, self.config)
         self.bootconfig = default_registry.run(IBootConfigSort, 'boot_config_sort', bootconfig, self.config)
 
-    def get_imageconfig(self, package):
+    def imageconfig_get(self, package):
         for i in self.imageconfigs.itervalues():
             if i.package == package:
                 return i
         raise KeyError(package)
 
-    def run_imagetask(self, type, imageconfig):
-        return default_registry.run(IImageTask, type, self.config, imageconfig)
+    def run_imagetask(self, type, imageconfig, maintainer_args):
+        return default_registry.run(IImageTask, 'image_' + type, self.config, imageconfig, maintainer_args)
 
     def run_systemtask(self, type):
-        return default_registry.run(ISystemTask, type, self.config, self.imageconfigs)
+        return default_registry.run(ISystemTask, 'system_' + type, self.config, self.imageconfigs)