Author: locilka Date: Fri Sep 5 10:20:28 2008 New Revision: 50718 URL: http://svn.opensuse.org/viewcvs/yast?rev=50718&view=rev Log: - Don't show selected desktop in proposal if none has been selected (bnc #422077). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/AddOnProduct.ycp trunk/packager/src/modules/DefaultDesktop.ycp trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=50718&r1=50717&r2=50718&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Sep 5 10:20:28 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 5 10:20:06 CEST 2008 - locilka@suse.cz + +- Don't show selected desktop in proposal if none has been selected + (bnc #422077). + +------------------------------------------------------------------- Thu Sep 4 14:25:58 CEST 2008 - lslezak@suse.cz - sw_single: display "Starting the Software Manager" instead of Modified: trunk/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduct.ycp?rev=50718&r1=50717&r2=50718&view=diff ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Fri Sep 5 10:20:28 2008 @@ -1198,7 +1198,7 @@ return p; }); - y2milestone ("Add-Ons Output: %2", exp); + y2milestone ("Add-Ons Output: %1", exp); return $[ "add_on_products" : exp, Modified: trunk/packager/src/modules/DefaultDesktop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/DefaultDesktop.ycp?rev=50718&r1=50717&r2=50718&view=diff ============================================================================== --- trunk/packager/src/modules/DefaultDesktop.ycp (original) +++ trunk/packager/src/modules/DefaultDesktop.ycp Fri Sep 5 10:20:28 2008 @@ -16,7 +16,7 @@ import "ProductFeatures"; import "Installation"; -// Could be defined in control file +// FIXME: Should be defined in control file // @see GetAllDesktopsMap map all_desktops = $[ "gnome" : $[ @@ -232,7 +232,7 @@ */ global string Description () { // TRANSLATORS: dialog label - return all_desktops[desktop, "label"]:_("No system type selected"); + return all_desktops[desktop, "label"]:""; } /** Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=50718&r1=50717&r2=50718&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Fri Sep 5 10:20:28 2008 @@ -329,9 +329,16 @@ // installation proposal - SW summary, %1 is name of the installed product // (e.g. openSUSE 10.3, SUSE Linux Enterprise ...) output = (list<string>)merge (output, ListSelected (`product, _("Product: %1"))); - if (contains (flags, `desktop)) - // installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE) - output = (list<string>)add (output, sformat(_("System Type: %1"), DefaultDesktop::Description ())); + + if (contains (flags, `desktop)) { + // BNC #422077, Desktop doesn't need to be defined, e.g. in SLED + string ddd = DefaultDesktop::Description(); + if (ddd != "") { + // installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE) + output = (list<string>)add (output, sformat(_("System Type: %1"), ddd)); + } + } + if (contains (flags, `pattern)) { list<string> patterns = ListSelected (`pattern, "+ %1"); @@ -341,6 +348,7 @@ output = (list<string>) add (output, _("Patterns:<br>") + mergestring (patterns, "<br>")); } } + if (contains (flags, `selection)) { list<string> selections = ListSelected (`selection, "+ %1"); @@ -350,6 +358,7 @@ output = (list<string>) add (output, _("Selections:<br>") + mergestring (selections, "<br>")); } } + if (contains (flags, `size)) { output = (list<string>)add (output, @@ -1594,6 +1603,7 @@ solve_errors = Pkg::PkgSolveErrors (); } + // Question: is `desktop appropriate for SLE? map ret = Summary ( [ `product, `pattern, `selection, `size, `desktop ], false); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org