Author: jsuchome Date: Thu Sep 22 11:04:32 2011 New Revision: 65903 URL: http://svn.opensuse.org/viewcvs/yast?rev=65903&view=rev Log: - use first stage saved data only in second stage (bnc#712900) - 2.21.7 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=65903&r1=65902&r2=65903&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Thu Sep 22 11:04:32 2011 @@ -1 +1 @@ -2.21.6 +2.21.7 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=65903&r1=65902&r2=65903&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Thu Sep 22 11:04:32 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 22 11:04:05 CEST 2011 - jsuchome@suse.cz + +- use first stage saved data only in second stage (bnc#712900) +- 2.21.7 + +------------------------------------------------------------------- Fri Aug 5 12:35:46 CEST 2011 - tgoettlicher@suse.de - fixed .desktop file (bnc #681249) Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=65903&r1=65902&r2=65903&view=diff ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Thu Sep 22 11:04:32 2011 @@ -951,7 +951,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