Author: locilka Date: Tue Oct 7 13:53:05 2008 New Revision: 51908 URL: http://svn.opensuse.org/viewcvs/yast?rev=51908&view=rev Log: Even a default desktop requires some patterns 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=51908&r1=51907&r2=51908&view=diff ============================================================================== --- trunk/packager/src/modules/DefaultDesktop.ycp (original) +++ trunk/packager/src/modules/DefaultDesktop.ycp Tue Oct 7 13:53:05 2008 @@ -50,6 +50,8 @@ boolean initialized = false; +global void SetDesktop (string new_desktop); + /** * Initialize default desktop from control file if specified there */ @@ -65,9 +67,9 @@ ("software", "default_desktop"); if (default_desktop == "") default_desktop = nil; - desktop = default_desktop; y2milestone ("Default desktop: '%1'", default_desktop); + SetDesktop (default_desktop); // See BNC #424678 if (all_desktops == nil) { @@ -217,10 +219,13 @@ y2milestone ("New desktop has been set: %1", desktop); - // Require new patterns - PackagesProposal::SetResolvables ( - packages_proposal_ID, `pattern, all_desktops[desktop,"patterns"]:[] - ); + 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