Author: ug Date: Fri Nov 20 11:49:00 2009 New Revision: 59650 URL: http://svn.opensuse.org/viewcvs/yast?rev=59650&view=rev Log: fix for conflicts in rules-dialogs Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoInstallRules.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=59650&r1=59649&r2=59650&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Nov 20 11:49:00 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 20 11:48:30 CET 2009 - ug@suse.de + +- fix for conflicts in rule-dialogs + +------------------------------------------------------------------- Thu Nov 19 14:41:56 CET 2009 - ug@suse.de - set mode to config during cloning (bnc#520658) Modified: trunk/autoinstallation/src/modules/AutoInstallRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoInstallRules.ycp?rev=59650&r1=59649&r2=59650&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstallRules.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstallRules.ycp Fri Nov 20 11:49:00 2009 @@ -612,6 +612,7 @@ dialogOrder = sort( dialogOrder ); integer dialogIndex = 0; +y2milestone("UWE UWE UWE"); while( dialogIndex <= size(dialogOrder)-1 ) { integer dialogNr = dialogOrder[dialogIndex]:0; term dialog_term = `VBox(); @@ -631,7 +632,6 @@ }); map element2file = $[]; - foreach ( map rule, rulelist, ``{ if( haskey( rule, "dialog" ) && rule["dialog","dialog_nr"]:0 == dialogNr ) { element_nr = rule["dialog","element"]:element_nr; @@ -686,7 +686,13 @@ string file = element2file[tointeger(ret)]:""; tomerge = filter (string f , tomerge, { return file != f; }); } - list<integer> conflicts = rulelist[tointeger(ret),"dialog","conflicts"]:[]; + list<integer> conflicts = []; + foreach( map r, rulelist, { + if( r["dialog","element"]:-1 == tointeger(ret) ) { + conflicts = r["dialog","conflicts"]:[]; + break; + } + }); foreach( integer element, conflicts, ``{ if( (boolean)(UI::QueryWidget(`id(ret), `Value)) ) conflictsCounter[element] = conflictsCounter[element]:0 + 1; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org