sablink/molecule-plugins
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[molecule] remaster plugin: remove 'mod' key from parser data dicts, make possible to split packages_to_add/packages_to_remove using comma

Browse Source
This commit is contained in:
Fabio Erculiani
2009-10-27 10:28:45 +01:00
parent 8731a14818
commit 14f2ae9dd9
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
molecule/specs/plugins/builtin.py
-1
View File
@@ -578,7 +578,6 @@ class LivecdSpec(GenericSpec):
'extra_mkisofs_parameters': {
'cb': self.always_valid,
've': self.ve_string_splitter,
'mod': self.ve_string_splitter,
},
'pre_iso_script': {
'cb': self.valid_exec,
molecule/specs/plugins/remaster.py
+2 -10
View File
@@ -322,7 +322,6 @@ class RemasterSpec(GenericSpec):
'extra_mkisofs_parameters': {
'cb': self.always_valid,
've': self.ve_string_splitter,
'mod': self.ve_string_splitter,
},
'pre_iso_script': {
'cb': self.valid_exec,
@@ -339,22 +338,18 @@ class RemasterSpec(GenericSpec):
'iso_mounter': {
'cb': self.ne_list,
've': self.ve_string_splitter,
'mod': self.ve_string_splitter,
},
'iso_umounter': {
'cb': self.ne_list,
've': self.ve_string_splitter,
'mod': self.ve_string_splitter,
},
'squash_mounter': {
'cb': self.ne_list,
've': self.ve_string_splitter,
'mod': self.ve_string_splitter,
},
'squash_umounter': {
'cb': self.ne_list,
've': self.ve_string_splitter,
'mod': self.ve_string_splitter,
},
'merge_livecd_root': {
'cb': self.valid_dir,
@@ -370,18 +365,15 @@ class RemasterSpec(GenericSpec):
},
'packages_to_remove': {
'cb': self.ne_list,
've': self.ve_string_splitter,
'mod': self.ve_string_splitter,
've': self.valid_comma_sep_list,
},
'packages_to_add': {
'cb': self.ne_list,
've': self.ve_string_splitter,
'mod': self.ve_string_splitter,
've': self.valid_comma_sep_list,
},
'repositories_update_cmd': {
'cb': self.ne_list,
've': self.ve_string_splitter,
'mod': self.ve_string_splitter,
},
'execute_repositories_update': {
'cb': self.valid_ascii,
molecule/specs/skel.py
+4
View File
@@ -69,6 +69,10 @@ class GenericSpecFunctions:
return False
return True
def valid_comma_sep_list(self, x):
return [y.strip() for y in \
unicode(x,'raw_unicode_escape').split(",") if y.strip()]
def valid_path_list(self, x):
return [y.strip() for y in \
unicode(x,'raw_unicode_escape').split(",") if \