Author: locilka Date: Tue Oct 7 16:04:45 2008 New Revision: 51922 URL: http://svn.opensuse.org/viewcvs/yast?rev=51922&view=rev Log: Always set desktop Modified: trunk/packager/src/modules/DefaultDesktop.ycp Modified: trunk/packager/src/modules/DefaultDesktop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/DefaultDesktop.ycp?rev=51922&r1=51921&r2=51922&view=diff ============================================================================== --- trunk/packager/src/modules/DefaultDesktop.ycp (original) +++ trunk/packager/src/modules/DefaultDesktop.ycp Tue Oct 7 16:04:45 2008 @@ -212,9 +212,13 @@ global void SetDesktop (string new_desktop) { Init(); - if (new_desktop != nil && ! haskey (all_desktops, new_desktop)) { + if (new_desktop == nil) { + // Reset the selected patterns + y2milestone ("Reseting DefaultDesktop"); + PackagesProposal::SetResolvables (packages_proposal_ID, `pattern, []); + } else if (! haskey (all_desktops, new_desktop)) { y2error ("Attempting to set desktop to unknown %1", new_desktop); - } else if (desktop != new_desktop) { + } else { desktop = new_desktop; y2milestone ("New desktop has been set: %1", desktop); @@ -222,9 +226,6 @@ if (desktop != nil && desktop != "") { // Require new patterns PackagesProposal::SetResolvables (packages_proposal_ID, `pattern, all_desktops[desktop,"patterns"]:[]); - } else { - // Reset the selected patterns - PackagesProposal::SetResolvables (packages_proposal_ID, `pattern, []); } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org