[f21/master] Don't automatically select environments for kickstart installs (#1018226)
Vratislav Podzimek
vpodzime at redhat.com
Mon Oct 13 07:46:27 UTC 2014
On Fri, 2014-10-10 at 16:21 -0400, David Shea wrote:
> (oh yeah, tui)
>
> This fixes the problem of kickstart installs with no %packages appearing
> to select an environment but still leaving the software spoke
> incomplete.
> ---
> pyanaconda/ui/gui/spokes/software.py | 3 ++-
> pyanaconda/ui/tui/spokes/software.py | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py
> index 7ab862c..3984ee2 100644
> --- a/pyanaconda/ui/gui/spokes/software.py
> +++ b/pyanaconda/ui/gui/spokes/software.py
> @@ -285,8 +285,9 @@ class SoftwareSelectionSpoke(NormalSpoke):
>
> radio = Gtk.RadioButton(group=firstRadio)
>
> + # automatically select an environment if this is an interactive install
> active = environment == self.environment or \
> - not self.environment and firstEnvironment
> + not flags.automatedInstall and not self.environment and firstEnvironment
> radio.set_active(active)
> if active:
> self.environment = environment
> diff --git a/pyanaconda/ui/tui/spokes/software.py b/pyanaconda/ui/tui/spokes/software.py
> index e8866d3..ce069c9 100644
> --- a/pyanaconda/ui/tui/spokes/software.py
> +++ b/pyanaconda/ui/tui/spokes/software.py
> @@ -75,7 +75,7 @@ class SoftwareSpoke(NormalTUISpoke):
> # default, and it really should be so we can maintain consistency
> # with graphical behavior
> if self._selection >= 0 and not self.environment \
> - and not self._kickstarted:
> + and not flags.automatedInstall:
> self.apply()
>
> if not self.environment:
ACK.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
More information about the anaconda-patches
mailing list