Author: jsuchome Date: Mon Sep 19 13:31:31 2011 New Revision: 65791 URL: http://svn.opensuse.org/viewcvs/yast?rev=65791&view=rev Log: - use first stage saved data only in second stage (bnc#712900) - 2.17.50 Modified: branches/SuSE-Code-11-SP2-Branch/users/VERSION branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes branches/SuSE-Code-11-SP2-Branch/users/src/UsersSimple.pm Modified: branches/SuSE-Code-11-SP2-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/VERSION?rev=65791&r1=65790&r2=65791&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/users/VERSION Mon Sep 19 13:31:31 2011 @@ -1 +1 @@ -2.17.49 +2.17.50 Modified: branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes?rev=65791&r1=65790&r2=65791&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes Mon Sep 19 13:31:31 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 19 12:57:02 CEST 2011 - jsuchome@suse.cz + +- use first stage saved data only in second stage (bnc#712900) +- 2.17.50 + +------------------------------------------------------------------- Tue Aug 30 14:41:26 CEST 2011 - jsuchome@suse.cz - added help text about SHA hashing functions (bnc#714389) Modified: branches/SuSE-Code-11-SP2-Branch/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/src/UsersSimple.pm?rev=65791&r1=65790&r2=65791&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/src/UsersSimple.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/users/src/UsersSimple.pm Mon Sep 19 13:31:31 2011 @@ -945,7 +945,9 @@ my $file = Directory->vardir()."/users_first_stage.ycp"; my $ret = 0; - if (FileUtils->Exists ($file) && ($force || $first_stage_data_not_read)) { + if (Stage->cont () && FileUtils->Exists ($file) && + ($force || $first_stage_data_not_read)) + { my $data = SCR->Read (".target.ycp", $file); $first_stage_data_not_read = 0; if (defined $data && ref ($data) eq "HASH") { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org