diff options
| author | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2014-01-15 13:45:05 +0200 |
|---|---|---|
| committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2014-01-15 13:51:07 +0200 |
| commit | c0e61fa1822562f7b92ac4cb14905fcf5803538e (patch) | |
| tree | eb4ac0b1588c18f17e61d0cdc21ce63377e21682 | |
| parent | 7a3e7c77495b469dccec68a480f2c161980912c1 (diff) | |
| download | mic-c0e61fa1822562f7b92ac4cb14905fcf5803538e.tar.gz mic-c0e61fa1822562f7b92ac4cb14905fcf5803538e.tar.bz2 mic-c0e61fa1822562f7b92ac4cb14905fcf5803538e.zip | |
kickstart: remove old installerfw keywords
The story: the installer framework keyword in KS files originally was
"installerfw", and the keyword for the first plugin was "extlinux". However,
we realized that this is bad naming, and commit changed the names in commit
'0bafaa1b31a0 kickstart: add an alias for installerfw'. That commit preserved
the old name as aliases for compatibility reasons. And added scary warnings
which are printed when the old names are used.
The only user user of the old names was Tizen IVI, and it stopped using them
very long time ago. Now it uses the new 'installerfw_plugins' and 'bootloader'
keywords instead.
So it is time to kill the old keywords completely and clean the code up. And
this is exactly what this patch does.
Change-Id: I23ef6c5850744734816974233229cf99fca05f38
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
| -rw-r--r-- | mic/kickstart/__init__.py | 1 | ||||
| -rw-r--r-- | mic/kickstart/custom_commands/installerfw.py | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py index ffb7fe8..f902cc1 100644 --- a/mic/kickstart/__init__.py +++ b/mic/kickstart/__init__.py @@ -102,7 +102,6 @@ def read_kickstart(path): commandMap[using_version]["bootloader"] = micboot.Mic_Bootloader commandMap[using_version]["part"] = partition.Mic_Partition commandMap[using_version]["partition"] = partition.Mic_Partition - commandMap[using_version]["installerfw"] = installerfw.Mic_installerfw commandMap[using_version]["installerfw_plugins"] = installerfw.Mic_installerfw dataMap[using_version]["RepoData"] = micrepo.Mic_RepoData dataMap[using_version]["PartData"] = partition.Mic_PartData diff --git a/mic/kickstart/custom_commands/installerfw.py b/mic/kickstart/custom_commands/installerfw.py index 20856e7..4fa39ed 100644 --- a/mic/kickstart/custom_commands/installerfw.py +++ b/mic/kickstart/custom_commands/installerfw.py @@ -53,11 +53,6 @@ class Mic_installerfw(KickstartCommand): return op def parse(self, args): - if self.currentCmd == "installerfw": - msger.warning("please, use 'installerfw_plugins' instead of " \ - "'installerfw', the latter is obsolete and will be " \ - "removed in future releases") - (_, extra) = self.op.parse_args(args=args, lineno=self.lineno) if len(extra) != 1: @@ -67,12 +62,4 @@ class Mic_installerfw(KickstartCommand): self.features = extra[0].split(",") - if "extlinux" in self.features: - msger.warning("please, use 'bootloader' installer framework " \ - "plugin name instead of 'extlinux', the latter " \ - "is obsolete and will be removed in future releases") - # Rename all occurances of "extlinux" to "bootloader" - self.features = [ "bootloader" if x == "extlinux" else x - for x in self.features ] - return self |