[PATCH] Only check mandatory spokes in automated install (#956960, 895258, )

Vratislav Podzimek vpodzime at redhat.com
Mon Apr 29 10:48:44 UTC 2013


On Fri, 2013-04-26 at 14:23 -0700, Brian C. Lane wrote:
> From: "Brian C. Lane" <bcl at redhat.com>
> 
> This should fix up the various bugs related to automated install in text
> and cmdline mode getting stuck waiting for user input.
> ---
>  pyanaconda/ui/tui/hubs/summary.py | 2 +-
>  pyanaconda/ui/tui/spokes/user.py  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/pyanaconda/ui/tui/hubs/summary.py b/pyanaconda/ui/tui/hubs/summary.py
> index 412735d..6f6ad5c 100644
> --- a/pyanaconda/ui/tui/hubs/summary.py
> +++ b/pyanaconda/ui/tui/hubs/summary.py
> @@ -53,7 +53,7 @@ class SummaryHub(TUIHub):
>      # where all the data is in hand.  If not in hand, do the actual prompt.
>      def prompt(self, args=None):
>          if flags.automatedInstall and \
> -        all(spoke.completed for spoke in self._keys.values()):
> +        all(spoke.completed for spoke in self._keys.values() if spoke.mandatory):
>              self.close()
>              return None
>          if not flags.ksprompt:
> diff --git a/pyanaconda/ui/tui/spokes/user.py b/pyanaconda/ui/tui/spokes/user.py
> index 138733e..83a1440 100644
> --- a/pyanaconda/ui/tui/spokes/user.py
> +++ b/pyanaconda/ui/tui/spokes/user.py
> @@ -67,7 +67,7 @@ class UserSpoke(FirstbootSpokeMixIn, EditTUISpoke):
>  
>      @property
>      def completed(self):
> -        return self.data.user.userList
> +        return len(self.data.user.userList) > 0
>  
>      @property
>      def mandatory(self):
ACK.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list