Author: waldi Date: Wed Mar 5 13:53:07 2008 New Revision: 10718 Log: lib/dkt/hooks/modules/backward_config_boot.py, lib/dkt/hooks/modules/backward_symlinks.py: Move type detection.
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py 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 13:53:07 2008 @@ -6,10 +6,7 @@ from dkt.imageconfig.interfaces import IImageBaseConfig class Hook(object): - def _add_config(self, configs, version, data): - image_file = data[0] - initramfs_file = data[1] - symlinks_data = data[2] + def _add_config(self, configs, version, image_file, initramfs_file, symlinks_file): c = { 'image': { @@ -24,10 +21,9 @@ if initramfs_file is not None: c['initramfs'] = {'file': initramfs_file} - if symlinks_data is not None: + if symlinks_file is not None: c['backward-compatibility'] = { - 'symlink-file': symlinks_data[0], - 'symlink-type': symlinks_data[1], + 'symlink-file': symlinks_file, } configs.add('boot-backward-' + version, MutableConfig(c)) @@ -39,17 +35,16 @@ if IImageBaseConfig(l).file == image_file: return self._update_config(l, data) - return self._add_config(configs, version, data) + return self._add_config(configs, version, *data) def _update_config(self, config, data): - symlinks_data = data[2] + symlinks_file = data[2] config = IMutableConfig(config) - if symlinks_data is not None: + if symlinks_file is not None: config.add_section('backward-compatibility') - config.set('backward-compatibility', 'symlink-file', symlinks_data[0]) - config.set('backward-compatibility', 'symlink-type', symlinks_data[1]) + config.set('backward-compatibility', 'symlink-file', symlinks_file) def _get_files(self): ret = ([], [], [], []) @@ -112,10 +107,7 @@ link_parts = os.path.basename(link).split('-', 1) e = versions.get(link_parts[1], None) if e is not None: - type = 0 - if file[1].endswith('.old'): - type = 1 - e[2] = (file[0], type) + e[2] = file[0] for file in iter(files[3]): if not os.path.islink(file[0]): 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 13:53:07 2008 @@ -40,13 +40,14 @@ for i in chain(*bootconfigs): config = i.config if 'backward-compatibility' in config: - symlink_type = config.get('backward-compatibility', 'symlink-type', None) - if symlink_type == 0: - symlink_act = i - symlink_act_file = config.get('backward-compatibility', 'symlink-file') - elif symlink_type == 1: - symlink_old = i - symlink_old_file = config.get('backward-compatibility', 'symlink-file') + symlink_file = config.get('backward-compatibility', 'symlink-file', None) + if symlink_file: + if symlink_file.endswith('.old'): + symlink_old = i + symlink_old_file = symlink_file + else: + symlink_act = i + symlink_act_file = symlink_file if config.get('backward-compatibility', 'symlink-create', None): symlink_create = i _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes