[f19-branch???/master][PATCH] Do not preselect the environment if using kickstart packages (#978852)

Samantha N. Bueno sbueno+anaconda at redhat.com
Thu Jun 27 12:56:39 UTC 2013


ACK.

I'm ok with seeing this go into f19-branch if others are. Ks text
install with package sets other than Gnome DE work as expected for me
with this patch applied.

On Thu, Jun 27, 2013 at 11:51:02AM +0200, Vratislav Podzimek wrote:
> Doing so overrides the kickstart package selection and stops the automated
> installation.
> 
> Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
> ---
>  pyanaconda/ui/tui/spokes/software.py | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/pyanaconda/ui/tui/spokes/software.py b/pyanaconda/ui/tui/spokes/software.py
> index 84d0737..065f232 100644
> --- a/pyanaconda/ui/tui/spokes/software.py
> +++ b/pyanaconda/ui/tui/spokes/software.py
> @@ -49,6 +49,9 @@ class SoftwareSpoke(NormalTUISpoke):
>          # for detecting later whether any changes have been made
>          self._origEnv = None
>  
> +        # are we taking values (package list) from a kickstart file?
> +        self._kickstarted = flags.automatedInstall and self.data.packages.seen
> +
>      def initialize(self):
>          NormalTUISpoke.initialize(self)
>          threadMgr.add(AnacondaThread(name=THREAD_SOFTWARE_WATCHER, target=self._initialize))
> @@ -56,7 +59,7 @@ class SoftwareSpoke(NormalTUISpoke):
>      def _initialize(self):
>          """ Private initialize. """
>          threadMgr.wait(THREAD_PAYLOAD)
> -        if flags.automatedInstall and self.data.packages.seen:
> +        if self._kickstarted:
>              threadMgr.wait(THREAD_PAYLOAD_MD)
>          else:
>              try:
> @@ -82,14 +85,15 @@ class SoftwareSpoke(NormalTUISpoke):
>          # quite ugly, but env isn't getting set to gnome (or anything) by
>          # default, and it really should be so we can maintain consistency
>          # with graphical behavior
> -        if self._selection >= 0 and not self.environment:
> +        if self._selection >= 0 and not self.environment \
> +                and not self._kickstarted:
>              self.apply()
>  
>          if not self.environment:
>              # Ks installs with %packages will have an env selected, unless
>              # they did an install without a desktop environment. This should
>              # catch that one case.
> -            if flags.automatedInstall and self.data.packages.seen:
> +            if self._kickstarted:
>                  return _("Custom software selected")
>              return _("Nothing selected")
>  
> @@ -158,7 +162,11 @@ class SoftwareSpoke(NormalTUISpoke):
>      def apply(self):
>          """ Apply our selections """
>          self._apply()
> +
> +        # no longer using values from kickstart
> +        self._kickstarted = False
>          self.data.packages.seen = True
> +
>          threadMgr.add(AnacondaThread(name=THREAD_CHECK_SOFTWARE,
>                                       target=self.checkSoftwareSelection))
>  
> -- 
> 1.7.11.7
> 
> _______________________________________________
> anaconda-patches mailing list
> anaconda-patches at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches


More information about the anaconda-patches mailing list