Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2015-09-13 09:43:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-users" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2015-07-16 17:18:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2015-09-13 09:43:42.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 1 15:29:38 UTC 2015 - [email protected] + +- Move users creation to first stage during autoinstallation, + so it is not needed to run the 2nd stage to have a minimal system + (bnc#892091) +- 3.1.40 +------------------------------------------------------------------- Old: ---- yast2-users-3.1.39.tar.bz2 New: ---- yast2-users-3.1.40.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.kS78ut/_old 2015-09-13 09:43:43.000000000 +0200 +++ /var/tmp/diff_new_pack.kS78ut/_new 2015-09-13 09:43:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.39 +Version: 3.1.40 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,6 +57,7 @@ Provides: yast2-config-users Provides: yast2-trans-inst-user Provides: yast2-trans-users +Conflicts: autoyast2 < 3.1.92 # y2usernote, y2useritem Requires: yast2-perl-bindings >= 2.18.0 ++++++ yast2-users-3.1.39.tar.bz2 -> yast2-users-3.1.40.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.39/package/yast2-users.changes new/yast2-users-3.1.40/package/yast2-users.changes --- old/yast2-users-3.1.39/package/yast2-users.changes 2015-07-08 11:52:37.000000000 +0200 +++ new/yast2-users-3.1.40/package/yast2-users.changes 2015-09-04 13:32:16.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 1 15:29:38 UTC 2015 - [email protected] + +- Move users creation to first stage during autoinstallation, + so it is not needed to run the 2nd stage to have a minimal system + (bnc#892091) +- 3.1.40 +------------------------------------------------------------------- Thu Jul 2 20:49:05 UTC 2015 - [email protected] - Allow editing password-less users (bsc#928607) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.39/package/yast2-users.spec new/yast2-users-3.1.40/package/yast2-users.spec --- old/yast2-users-3.1.39/package/yast2-users.spec 2015-07-08 11:52:37.000000000 +0200 +++ new/yast2-users-3.1.40/package/yast2-users.spec 2015-09-04 13:32:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.39 +Version: 3.1.40 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,6 +57,7 @@ Provides: yast2-config-users Provides: yast2-trans-inst-user Provides: yast2-trans-users +Conflicts: autoyast2 < 3.1.92 # y2usernote, y2useritem Requires: yast2-perl-bindings >= 2.18.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.39/src/clients/users_auto.rb new/yast2-users-3.1.40/src/clients/users_auto.rb --- old/yast2-users-3.1.39/src/clients/users_auto.rb 2015-07-08 11:52:37.000000000 +0200 +++ new/yast2-users-3.1.40/src/clients/users_auto.rb 2015-09-04 13:32:16.000000000 +0200 @@ -129,13 +129,15 @@ @ret = Users.Read == "" Progress.set(@progress_orig) elsif @func == "Write" + # NOTE: this code is not executed during autoinstallation (instead, the + # users_finish is used). Yast.import "Progress" Users.SetWriteOnly(true) @progress_orig = Progress.set(false) @ret = Users.Write == "" Progress.set(@progress_orig) - # Return if configuration was changed - # return boolean + # Return if configuration was changed + # return boolean elsif @func == "GetModified" @ret = Users.Modified # Set all modified flags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.39/src/clients/users_finish.rb new/yast2-users-3.1.40/src/clients/users_finish.rb --- old/yast2-users-3.1.39/src/clients/users_finish.rb 2015-07-08 11:52:37.000000000 +0200 +++ new/yast2-users-3.1.40/src/clients/users_finish.rb 2015-09-04 13:32:16.000000000 +0200 @@ -66,11 +66,28 @@ elsif @func == "Write" # Creating all users and their environment - # write the root password - UsersSimple.Write + if Mode.autoinst + # Write imported users (during autoupgrade no changes are done) - other_users = setup_all_users - Users.Write if other_users + # During installation, some package could add a new user, so we + # need to read them again before writing. + Users.SetExportAll(true) + saved = Users.Export + Users.ReadLocal + Users.Import(saved) + + # Write users + Users.SetWriteOnly(true) + @progress_orig = Progress.set(false) + @ret = Users.Write == "" + Progress.set(@progress_orig) + else + # write the root password + UsersSimple.Write + + other_users = setup_all_users + Users.Write if other_users + end else Builtins.y2error("unknown function: %1", @func) end
