[kernel] r11121 - in people/waldi/dkt/lib/dkt: bin bootconfig hooks hooks/modules imageconfig itemconfig

[Bastian Blank]

Author: waldi
Date: Wed Apr 23 07:40:35 2008
New Revision: 11121

Log:
* lib/dkt/itemconfig: Move from lib/dkt/imageconfig.
* lib/dkt/bin/base.py, lib/dkt/bootconfig/base.py,
  lib/dkt/bootconfig/hooks_prepare_linux.py, lib/dkt/bootconfig/linux.py
  lib/dkt/hooks/interfaces.py, lib/dkt/hooks/modules/backward_config_boot.py,
  lib/dkt/hooks/modules/backward_symlinks.py, lib/dkt/itemconfig/list.py:
  Fix imports.


Added:
   people/waldi/dkt/lib/dkt/itemconfig/
      - copied from r10706, /people/waldi/dkt/lib/dkt/imageconfig/
Removed:
   people/waldi/dkt/lib/dkt/imageconfig/
Modified:
   people/waldi/dkt/lib/dkt/bin/base.py
   people/waldi/dkt/lib/dkt/bootconfig/base.py
   people/waldi/dkt/lib/dkt/bootconfig/hooks_prepare_linux.py
   people/waldi/dkt/lib/dkt/bootconfig/linux.py
   people/waldi/dkt/lib/dkt/hooks/interfaces.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/itemconfig/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 Apr 23 07:40:35 2008
@@ -1,7 +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.itemconfig.list import ImageConfigList
+from dkt.itemconfig.interfaces import IImageBaseConfig
 from dkt.systemconfig.file import SystemConfig
 from dkt.systemconfig.defaults import CONFIG_FILE, IMAGECONFIG_DIRS
 

Modified: people/waldi/dkt/lib/dkt/bootconfig/base.py
==============================================================================
--- people/waldi/dkt/lib/dkt/bootconfig/base.py	(original)
+++ people/waldi/dkt/lib/dkt/bootconfig/base.py	Wed Apr 23 07:40:35 2008
@@ -1,5 +1,5 @@
 from interfaces import IBootBaseConfig
-from dkt.imageconfig.interfaces import IImageBaseConfig
+from dkt.itemconfig.interfaces import IImageBaseConfig
 from dkt.support.version import VersionImage
 from zope.interface import implements
 

Modified: people/waldi/dkt/lib/dkt/bootconfig/hooks_prepare_linux.py
==============================================================================
--- people/waldi/dkt/lib/dkt/bootconfig/hooks_prepare_linux.py	(original)
+++ people/waldi/dkt/lib/dkt/bootconfig/hooks_prepare_linux.py	Wed Apr 23 07:40:35 2008
@@ -1,7 +1,7 @@
 from linux import BootConfigLinux
 from dkt.hooks import default_registry, register
 from dkt.hooks.interfaces import IBootConfigPrepare
-from dkt.imageconfig.interfaces import IImageBaseConfig
+from dkt.itemconfig.interfaces import IImageBaseConfig
 
 class Hook(object):
     def boot_config_prepare(self, bootconfigs, systemconfig, imageconfigs):

Modified: people/waldi/dkt/lib/dkt/bootconfig/linux.py
==============================================================================
--- people/waldi/dkt/lib/dkt/bootconfig/linux.py	(original)
+++ people/waldi/dkt/lib/dkt/bootconfig/linux.py	Wed Apr 23 07:40:35 2008
@@ -1,7 +1,7 @@
 from base import BootConfigBase
 from entry import BootEntry
 from interfaces import IBootMainConfig
-from dkt.imageconfig.interfaces import IImageBaseConfig, IImageLinuxInitramfsConfig
+from dkt.itemconfig.interfaces import IImageBaseConfig, IImageLinuxInitramfsConfig
 #from dkt.hooks.interfaces import 
 from zope.interface import implements
 

Modified: people/waldi/dkt/lib/dkt/hooks/interfaces.py
==============================================================================
--- people/waldi/dkt/lib/dkt/hooks/interfaces.py	(original)
+++ people/waldi/dkt/lib/dkt/hooks/interfaces.py	Wed Apr 23 07:40:35 2008
@@ -13,7 +13,7 @@
     pass
 
 class IBootConfigPrepare(IHookRunAllArg):
-    def boot_config_prepare(bootconfigs, systemconfig, imageconfigs):
+    def boot_config_prepare(bootconfigs, systemconfig, itemconfigs):
         pass
 
 class IBootConfigPartition(IHookRunAllArg):
@@ -29,20 +29,20 @@
         pass
 
 class IImageConfig(IHookRunAll):
-    def image_config(imageconfigs, systemconfig):
+    def image_config(itemconfigs, systemconfig):
         pass
 
 class IImageTask(IHookRunAll):
-    def image_preinst(self, systemconfig, maintainer_args):
+    def image_preinst(self, systemconfig, itemconfig, maintainer_args):
         pass
 
-    def image_postinst(self, systemconfig, imageconfig, maintainer_args):
+    def image_postinst(self, systemconfig, itemconfig, maintainer_args):
         pass
 
-    def image_prerm(self, systemconfig, imageconfig, maintainer_args):
+    def image_prerm(self, systemconfig, itemconfig, maintainer_args):
         pass
 
-    def image_postrm(self, systemconfig, maintainer_args):
+    def image_postrm(self, systemconfig, itemconfig, maintainer_args):
         pass
 
 class IModulesTask(IHookRunAll):
@@ -59,16 +59,16 @@
         pass
 
 class ISystemTask(IHookRunAll):
-    def system_preinst(self, systemconfig, imageconfigs):
+    def system_preinst(self, systemconfig, itemconfigs):
         pass
 
-    def system_postinst(self, systemconfig, imageconfigs):
+    def system_postinst(self, systemconfig, itemconfigs):
         pass
 
-    def system_prerm(self, systemconfig, imageconfigs):
+    def system_prerm(self, systemconfig, itemconfigs):
         pass
 
-    def system_postrm(self, systemconfig, imageconfigs):
+    def system_postrm(self, systemconfig, itemconfigs):
         pass
 
 

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 Apr 23 07:40:35 2008
@@ -3,7 +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
+from dkt.itemconfig.interfaces import IImageBaseConfig
 
 class Hook(object):
     def _add_config(self, configs, version, image_file, initramfs_file):

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 Apr 23 07:40:35 2008
@@ -3,7 +3,7 @@
 
 from dkt.config.interfaces import IMutableConfig
 from dkt.hooks import default_registry, interfaces, register
-from dkt.imageconfig.interfaces import IImageBaseConfig
+from dkt.itemconfig.interfaces import IImageBaseConfig
 from dkt.support.system import architecture
 
 class Hook(object):

Modified: people/waldi/dkt/lib/dkt/itemconfig/list.py
==============================================================================
--- /people/waldi/dkt/lib/dkt/imageconfig/list.py	(original)
+++ people/waldi/dkt/lib/dkt/itemconfig/list.py	Wed Apr 23 07:40:35 2008
@@ -1,7 +1,7 @@
 import os
 
 from dkt.config.file import MutableConfig
-from dkt.imageconfig.interfaces import IImageBaseConfig
+from dkt.itemconfig.interfaces import IImageBaseConfig
 
 class ImageConfigList(dict):
     def add(self, name, value):