Merge pull request #388 from mchf/master

Merged SLE-15-SP5 branch
yast · Jul 25, 2023 · 750f509 · 750f509
2 parents c699518 + 6201895
commit 750f509
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul 25 11:04:17 UTC 2023 - Michal Filka <mfilka@suse.com>
+
+- bsc#1211583
+  - do not pre-fill non-sense user password when going back after
+    importing user
+- 4.6.4
+
 -------------------------------------------------------------------
 Mon Jul 24 13:21:21 UTC 2023 - Ancor Gonzalez Sosa <ancor@suse.com>
 

diff --git a/package/yast2-users.spec b/package/yast2-users.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-users
-Version:        4.6.3
+Version:        4.6.4
 Release:        0
 Summary:        YaST2 - User and Group Configuration
 License:        GPL-2.0-only

diff --git a/src/lib/users/dialogs/inst_user_first.rb b/src/lib/users/dialogs/inst_user_first.rb
@@ -319,7 +319,15 @@ def imported_users?
     #
     # @return [Array<Y2Users::User>]
     def imported_users
-      @imported_users = config.users.select { |u| importable_users.any?(u) }
+      @imported_users = config.users.select do |u|
+        importable_users.any? do |iu|
+          # sanitized_user is what meets each user when being prepared for writing
+          # basically it removes some user's config under some circumstances. When
+          # omited here, then it leads to failure detection of already imported (same)
+          # users when going back in installation.
+          u == sanitized_user(iu)
+        end
+      end
     end
 
     # Users database that was imported from a different system (done during pre_install)