Author: locilka Date: Tue Feb 2 17:29:47 2010 New Revision: 60666 URL: http://svn.opensuse.org/viewcvs/yast?rev=60666&view=rev Log: Fixed generating unique step IDs for Wizard too keep the same durign one YaST run (BNC #575092). - 2.17.84 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION branches/SuSE-Code-11-SP1-Branch/yast2/library/control/src/ProductControl.ycp branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/VERSION?rev=60666&r1=60665&r2=60666&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/VERSION Tue Feb 2 17:29:47 2010 @@ -1 +1 @@ -2.17.83 +2.17.84 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/control/src/ProductControl.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/control/src/ProductControl.ycp?rev=60666&r1=60665&r2=60666&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/control/src/ProductControl.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/control/src/ProductControl.ycp Tue Feb 2 17:29:47 2010 @@ -294,7 +294,7 @@ */ global define boolean checkArch(map mod , map def) { - y2milestone("mod: %1", mod); + y2debug ("Checking architecture: %1", mod); string archs = mod["archs"]:""; if (archs == "") { @@ -555,9 +555,18 @@ map workflow = FindMatchingWorkflow (stage, mode); list<map> modules = workflow["modules"]:[]; - y2debug ("modules: %1", modules ); + y2debug ("M1: %1", modules); + // Unique IDs have to always keep the same because some steps + // can be disabled while YaST is running + // @see BNC #575092 integer id = 1; + modules = maplist (map m, modules, ``{ + m["id"] = sformat("%1_%2", stage, id); + id = id + 1; + return m; + }); + if (which == `enabled) { modules = filter (map m, modules, { @@ -565,13 +574,14 @@ }); } + y2debug ("M2: %1", modules); + modules = maplist(map m, modules, ``{ - m["id"] = sformat("%1_%2", stage, id); - PrepareScripts(m); - id = id + 1; - return (m); - }); + PrepareScripts(m); + return m; + }); + y2debug ("M3: %1", modules); y2debug("Log files: %1", logfiles); return modules; } @@ -804,6 +814,7 @@ if (debug_workflow == true) { label = label + sformat (" [%1]", m["name"]:""); } + y2debug ("AddStep: %1/%2", label, id); UI::WizardCommand (`AddStep (label, id)); } }); @@ -1205,6 +1216,8 @@ while ((current_step >= 0) && (current_step < size(modules))) { map step = modules[current_step]:$[]; + y2milestone ("Current step: %1", step); + string step_name = step["name"]:""; // BNC #401319 // if "execute" is defined, it's called without modifications @@ -1254,12 +1267,15 @@ current_step = current_step + 1; } else + { current_step = current_step - 1; + } } + // Continue in 'while' means 'next step' if ( do_continue ) continue; term argterm = getClientTerm( step, defaults, former_result); - y2debug("Running module: %1 (%2)", argterm, current_step); + y2milestone ("Running module: %1 (%2)", argterm, current_step); symbol module_name = symbolof( argterm ); Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes?rev=60666&r1=60665&r2=60666&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Tue Feb 2 17:29:47 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 2 17:20:29 CET 2010 - locilka@suse.cz + +- Fixed generating unique step IDs for Wizard too keep the same + durign one YaST run (BNC #575092). +- 2.17.84 + +------------------------------------------------------------------- Mon Jan 18 14:38:15 CET 2010 - jsuchome@suse.cz - SERVICES.pm: read descriptions (bnc#570298); get single service -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org