Merge pull request #105 from ancorgs/import_users

Fix Dialogs::InstUserFirst to work if the module Users is imported
yast · Aug 12, 2016 · 5fa6a5f · 5fa6a5f
2 parents a846ea7 + fab6b82
commit 5fa6a5f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 11 11:37:12 UTC 2016 - ancor@suse.com
+
+- Fixed the installation dialog for user creation so it works
+  also in YaST Firstboot (needed to fix bsc#992245)
+- 3.1.54
+
 -------------------------------------------------------------------
 Mon Jun 27 09:18:59 UTC 2016 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-users.spec b/package/yast2-users.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-users
-Version:        3.1.53
+Version:        3.1.54
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/users/dialogs/inst_user_first.rb b/src/lib/users/dialogs/inst_user_first.rb
@@ -59,7 +59,7 @@ def initialize
 
       # Check if some users database was imported from a
       # different partition (done during pre_install)
-      users_databases = Users::UsersDatabase.all
+      users_databases = ::Users::UsersDatabase.all
       @import_available = users_databases.any?
       if @import_available
         @importable_users = importable_users(users_databases)
@@ -478,7 +478,7 @@ def valid_password?(username, pw1, pw2)
         return false
       end
 
-      passwd = Users::LocalPassword.new(username: username, plain: pw1, also_for_root: @use_pw_for_root)
+      passwd = ::Users::LocalPassword.new(username: username, plain: pw1, also_for_root: @use_pw_for_root)
       if !passwd.valid?
         message = passwd.errors.join("\n\n") + "\n\n" + _("Really use this password?")
         if !Popup.YesNo(message)