[f21/master] Use an empty string for no root password instead of None (#1155576)

David Shea dshea at redhat.com
Fri Oct 24 14:17:20 UTC 2014


pyanaconda/users.py expects that the password is always set to
a string. The root password will be set to empty and then locked.

The TUI already sets unset passwords to the empty string, so this
matches that in the GUI behavior.
---
 pyanaconda/ui/gui/spokes/password.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/password.py b/pyanaconda/ui/gui/spokes/password.py
index ac65d1b..186e802 100644
--- a/pyanaconda/ui/gui/spokes/password.py
+++ b/pyanaconda/ui/gui/spokes/password.py
@@ -139,7 +139,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler)
         self.data.rootpw.lock = False
 
         if not pw:
-            self.data.rootpw.password = None
+            self.data.rootpw.password = ''
             self.data.rootpw.isCrypted = False
             return
 
-- 
1.9.3



More information about the anaconda-patches mailing list