[PATCH 5/6] Make the decision to skip the welcome screen more complicated.

Chris Lumens clumens at redhat.com
Thu Nov 1 19:55:36 UTC 2012


For non-kickstart installs, we still want to display the screen even if a
language was provided on the command line as long as this is a final release.
Basically, do not skip betanag unless we're doing a kickstart install.
---
 pyanaconda/ui/gui/spokes/welcome.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
index cf408d9..e9119dc 100644
--- a/pyanaconda/ui/gui/spokes/welcome.py
+++ b/pyanaconda/ui/gui/spokes/welcome.py
@@ -102,7 +102,10 @@ class LanguageMixIn(object):
 
     @property
     def completed(self):
-        return self.data.lang.lang and self.data.lang.lang != ""
+        if flags.flags.automatedInstall:
+            return self.data.lang.lang and self.data.lang.lang != ""
+        else:
+            return self.data.lang.lang and self.data.lang.lang != "" and isFinal
 
     def initialize(self):
         store = self.builder.get_object("languageStore")
-- 
1.7.11.2



More information about the anaconda-patches mailing list