[anaconda][initial-setup][master][PATCH] TUI categories v2

Martin Kolman mkolman at redhat.com
Fri May 2 14:56:18 UTC 2014


So it basically boils down to the fact that Initial Setup
needs to be able to override the hubs collect method so that
it can get the categories and spokes it needs, without
anaconda having a dependency on Initial Setup.

This is done by overriding the _collectCategoriesAndSpokes method,
which was moved to th common module in the patch from Samantha
and was no longer being called. This resulted in Initial Setup
not finding any spokes and quiting in both GUI and TUI.

To fix the issue, I've modified the patch so that the Hub
class still has the _collectCategoriesAndSpokes() method.
It normally just calls the collect method from the common module,
but can be overridden in Initial Setup.

The second patch is a follow-up for Initial Setup that adds collect
support for the TUI Hub and moved the custom collect functions
to a common module to avoid code duplication.

Together those two patches make Initial setup work correctly
with the new cleaned-up category handling.


Samantha N. Bueno (1):
  Fix the way categories are handled in text mode.

 po/POTFILES.in                                |  6 ++++
 pyanaconda/ui/common.py                       | 51 +++++++++++++++++++++++++++
 pyanaconda/ui/gui/categories/__init__.py      | 13 +------
 pyanaconda/ui/gui/hubs/__init__.py            | 21 +----------
 pyanaconda/ui/gui/spokes/__init__.py          | 20 +----------
 pyanaconda/ui/tui/__init__.py                 |  4 +++
 pyanaconda/ui/tui/categories/Makefile.am      | 22 ++++++++++++
 pyanaconda/ui/tui/categories/__init__.py      | 46 ++++++++++++++++++++++++
 pyanaconda/ui/tui/categories/customization.py | 32 +++++++++++++++++
 pyanaconda/ui/tui/categories/localization.py  | 31 ++++++++++++++++
 pyanaconda/ui/tui/categories/software.py      | 31 ++++++++++++++++
 pyanaconda/ui/tui/categories/system.py        | 32 +++++++++++++++++
 pyanaconda/ui/tui/categories/user_settings.py | 32 +++++++++++++++++
 pyanaconda/ui/tui/hubs/__init__.py            | 22 ++++++------
 pyanaconda/ui/tui/hubs/summary.py             |  2 --
 pyanaconda/ui/tui/spokes/__init__.py          | 24 ++-----------
 pyanaconda/ui/tui/spokes/askvnc.py            |  2 --
 pyanaconda/ui/tui/spokes/network.py           |  3 +-
 pyanaconda/ui/tui/spokes/password.py          |  3 +-
 pyanaconda/ui/tui/spokes/shell_spoke.py       |  3 +-
 pyanaconda/ui/tui/spokes/software.py          |  3 +-
 pyanaconda/ui/tui/spokes/source.py            | 11 +++---
 pyanaconda/ui/tui/spokes/storage.py           |  7 ++--
 pyanaconda/ui/tui/spokes/time_spoke.py        |  3 +-
 pyanaconda/ui/tui/spokes/user.py              |  3 +-
 25 files changed, 325 insertions(+), 102 deletions(-)
 create mode 100644 pyanaconda/ui/tui/categories/Makefile.am
 create mode 100644 pyanaconda/ui/tui/categories/__init__.py
 create mode 100644 pyanaconda/ui/tui/categories/customization.py
 create mode 100644 pyanaconda/ui/tui/categories/localization.py
 create mode 100644 pyanaconda/ui/tui/categories/software.py
 create mode 100644 pyanaconda/ui/tui/categories/system.py
 create mode 100644 pyanaconda/ui/tui/categories/user_settings.py

-- 
1.9.0



More information about the anaconda-patches mailing list