Author: locilka Date: Mon Feb 23 12:43:27 2009 New Revision: 55674 URL: http://svn.opensuse.org/viewcvs/yast?rev=55674&view=rev Log: - Fixing ProductControl to avoid leaving a workflow with the `auto result - reruns the very first dialog (bnc #468677). - 2.17.68 Modified: branches/SuSE-Code-11-Branch/yast2/VERSION branches/SuSE-Code-11-Branch/yast2/library/control/src/ProductControl.ycp branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/VERSION?rev=55674&r1=55673&r2=55674&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-Branch/yast2/VERSION Mon Feb 23 12:43:27 2009 @@ -1 +1 @@ -2.17.67 +2.17.68 Modified: branches/SuSE-Code-11-Branch/yast2/library/control/src/ProductControl.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/library/control/src/ProductControl.ycp?rev=55674&r1=55673&r2=55674&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/library/control/src/ProductControl.ycp (original) +++ branches/SuSE-Code-11-Branch/yast2/library/control/src/ProductControl.ycp Mon Feb 23 12:43:27 2009 @@ -1384,8 +1384,14 @@ // BNC #468677 // The very first dialog must not exit with `back - if (result == `back && current_step == 0) { + // or `auto + if ( + current_step == 0 + && + (result == `back || (result == `auto && former_result == `back)) + ) { y2warning ("Returned %1, Current step %2 (%3). The current step will be called again...", result, current_step, step_name); + former_result = `next; result = `again; } Modified: branches/SuSE-Code-11-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/package/yast2.changes?rev=55674&r1=55673&r2=55674&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Mon Feb 23 12:43:27 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 23 12:41:52 CET 2009 - locilka@suse.cz + +- Fixing ProductControl to avoid leaving a workflow with the `auto + result - reruns the very first dialog (bnc #468677). +- 2.17.68 + +------------------------------------------------------------------- Wed Feb 18 17:38:10 CET 2009 - mzugec@suse.cz - NetworkInterfaces.GetDeviceTypes-added bond for s390 (bnc#476490) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org