[master] Only block the password/user spokes if data was given in kickstart

Vratislav Podzimek vpodzime at redhat.com
Thu Apr 3 10:19:18 UTC 2014


If a kickstart file without rootpw/user commands is used and root password or
user data is entered in the UI we don't want to block the spokes.

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/ui/gui/spokes/password.py | 3 ++-
 pyanaconda/ui/gui/spokes/user.py     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/password.py b/pyanaconda/ui/gui/spokes/password.py
index bedefb5..50d0136 100644
--- a/pyanaconda/ui/gui/spokes/password.py
+++ b/pyanaconda/ui/gui/spokes/password.py
@@ -145,7 +145,8 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler)
 
     @property
     def sensitive(self):
-        return not (self.completed and flags.automatedInstall)
+        return not (self.completed and flags.automatedInstall
+                    and self.data.rootpw.seen)
 
     def _checkPasswordEmpty(self, inputcheck):
         """Check whether a password has been specified at all."""
diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py
index 9cfcfa2..62f6024 100644
--- a/pyanaconda/ui/gui/spokes/user.py
+++ b/pyanaconda/ui/gui/spokes/user.py
@@ -398,7 +398,8 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
 
     @property
     def sensitive(self):
-        return not (self.completed and flags.automatedInstall)
+        return not (self.completed and flags.automatedInstall
+                    and self.data.user.seen)
 
     @property
     def completed(self):
-- 
1.9.0



More information about the anaconda-patches mailing list