The PATCH 2/2 fixes issues with addon-defined categories no longer working after we unified the GUI and TUI categories.
Vratislav Podzimek (2): Remove an unused import in pyanaconda/ui/__init__.py Expect addons to have categories for both GUI and TUI
pyanaconda/addons.py | 6 +++--- pyanaconda/ui/__init__.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)
The 'os' module is not used anywhere in the module.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com --- pyanaconda/ui/__init__.py | 1 - 1 file changed, 1 deletion(-)
diff --git a/pyanaconda/ui/__init__.py b/pyanaconda/ui/__init__.py index a12e88b..b7353af 100644 --- a/pyanaconda/ui/__init__.py +++ b/pyanaconda/ui/__init__.py @@ -22,7 +22,6 @@ __all__ = ["UserInterface"]
import copy -import os from pyanaconda.ui.common import collect
class PathDict(dict):
That's what we do in Anaconda now so we should expect the same from addons.
Also check the categories not spokes directory for existence when adding paths for categories.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com --- pyanaconda/addons.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/addons.py b/pyanaconda/addons.py index d360946..5083167 100644 --- a/pyanaconda/addons.py +++ b/pyanaconda/addons.py @@ -56,9 +56,9 @@ def collect_addon_paths(toplevel_addon_paths, ui_subdir="gui"): if os.path.isdir(addon_spoke_path): module_paths["spokes"].append(("%s.%s.spokes.%%s" % (addon_id, ui_subdir), addon_spoke_path))
- addon_category_path = os.path.join(path, addon_id, ui_subdir, "categories") - if os.path.isdir(addon_spoke_path): - module_paths["categories"].append(("%s.%s.categories.%%s" % (addon_id, ui_subdir), addon_category_path)) + addon_category_path = os.path.join(path, addon_id, "categories") + if os.path.isdir(addon_category_path): + module_paths["categories"].append(("%s.categories.%%s" % addon_id, addon_category_path))
return module_paths
On Tue, Jan 06, 2015 at 05:17:01PM +0100, Vratislav Podzimek wrote:
The PATCH 2/2 fixes issues with addon-defined categories no longer working after we unified the GUI and TUI categories.
Ack to both of these.
Vratislav Podzimek (2): Remove an unused import in pyanaconda/ui/__init__.py Expect addons to have categories for both GUI and TUI
pyanaconda/addons.py | 6 +++--- pyanaconda/ui/__init__.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)
-- 2.1.0
anaconda-patches mailing list anaconda-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
anaconda-patches@lists.fedorahosted.org