Author: locilka Date: Wed Mar 12 17:20:51 2008 New Revision: 45390 URL: http://svn.opensuse.org/viewcvs/yast?rev=45390&view=rev Log: - Fixed ProductControl to evaluate `accept and `ok as if it was `next (bnc #369846). - 2.13.108 Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/VERSION branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/yast2/VERSION?rev=45390&r1=45389&r2=45390&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/yast2/VERSION Wed Mar 12 17:20:51 2008 @@ -1 +1 @@ -2.13.107 +2.13.108 Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp?rev=45390&r1=45389&r2=45390&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp Wed Mar 12 17:20:51 2008 @@ -722,11 +722,11 @@ /** * Return proposal Label */ -global map getProposalProperties( string stage, string mode, string proptype -) +global map getProposalProperties( string stage, string mode, string proptype) { - list<map> proposals = getMatchingProposal(stage, mode, proptype); - map proposal = proposals[0]:$[]; + list <map> matching_proposals = getMatchingProposal (stage, mode, proptype); + map proposal = matching_proposals[0]:$[]; + if (haskey (proposal, "proposal_tabs")) { string text_domain = productControl["textdomain"]:"control"; @@ -738,8 +738,8 @@ return tab; }); } - return proposal; + return proposal; } global string GetTranslatedText (string key) { @@ -946,6 +946,12 @@ symbol result = (symbol) WFM::CallFunction (getClientName(step_name), args); y2milestone ("Calling %1 returned %2", argterm, result); + // bnc #369846 + if (result == `accept || result == `ok) { + y2milestone ("Evaluating %1 as it was `next", result); + result = `next; + } + // Remove file if step was run and returned (without a crash); if (current_step < size(modules) - 1 && !Stage::initial()) { Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes?rev=45390&r1=45389&r2=45390&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes Wed Mar 12 17:20:51 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 12 17:17:29 CET 2008 - locilka@suse.cz + +- Fixed ProductControl to evaluate `accept and `ok as if it was + `next (bnc #369846). +- 2.13.108 + +------------------------------------------------------------------- Tue Jan 15 10:52:47 CET 2008 - jsrain@suse.cz - merged texts from proofread -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org