Author: locilka
Date: Mon Mar 31 16:45:52 2008
New Revision: 45893
URL: http://svn.opensuse.org/viewcvs/yast?rev=45893&view=rev
Log:
- There are currently two possible patterns/desktops that can use
kdm: kde4-kdm and kdebase3-kdm (bnc #372506).
Modified:
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/desktop_finish.ycp
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45893&r1=45892&r2=45893&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Mon Mar 31 16:45:52 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Mar 31 16:42:40 CEST 2008 - locilka@suse.cz
+
+- There are currently two possible patterns/desktops that can use
+ kdm: kde4-kdm and kdebase3-kdm (bnc #372506).
+
+-------------------------------------------------------------------
Fri Mar 28 13:33:31 CET 2008 - locilka@suse.cz
- Automatic configuration has been moved from the end of the first
Modified: trunk/installation/src/clients/desktop_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/desktop_finish.ycp?rev=45893&r1=45892&r2=45893&view=diff
==============================================================================
--- trunk/installation/src/clients/desktop_finish.ycp (original)
+++ trunk/installation/src/clients/desktop_finish.ycp Mon Mar 31 16:45:52 2008
@@ -53,32 +53,36 @@
// check who provides suse_help_viewer
// if kdebase3-SuSE isn't installed by apache or apache2, set /etc/sysconfig/apache:DOC_SERVER
- if ((!(Pkg::IsProvided ("kdebase3-SuSE") || Pkg::IsSelected ("kdebase3-SuSE")))
+ if (
+ (!(Pkg::IsProvided ("kdebase3-SuSE") || Pkg::IsSelected ("kdebase3-SuSE")))
+ &&
+ (!(Pkg::IsProvided ("kdebase4-openSUSE") || Pkg::IsSelected ("kdebase4-openSUSE")))
&&
(Pkg::IsProvided ("apache2") || Pkg::IsSelected ("apache2")
|| Pkg::IsProvided ("apache") || Pkg::IsSelected ("apache")))
{
doc_server = true;
}
+
// this detects WM and DM according to selected patterns and
// installed packages
if ( !Mode::update () )
{
- map > desktop_data = $[
+ map > desktop_data = $[
"gnome" : $[
- "package" : "gdm",
+ "package" : ["gdm"],
"wm" : "gnome",
"dm" : "gdm",
"cursor" : "DMZ",
],
"kde" : $[
- "package" : "kde4-kdm",
+ "package" : ["kde4-kdm", "kdebase3-kdm"],
"wm" : "kde",
"dm" : "kdm",
"cursor" : "DMZ",
],
"twm" : $[
- "package" : "xorg-x11",
+ "package" : ["xorg-x11"],
"wm" : "",
"dm" : "xdm",
"cursor" : "DMZ",
@@ -90,22 +94,26 @@
string default_cursor = "DMZ";
string selected_desktop = DefaultDesktop::Desktop ();
- if (selected_desktop != "" && selected_desktop != nil)
- {
+
+ // DefaultDesktop has been set
+ if (selected_desktop != "" && selected_desktop != nil) {
y2milestone ("Desktop was set to %1", selected_desktop);
default_wm = desktop_data[selected_desktop, "wm"]:"";
default_dm = desktop_data[selected_desktop, "dm"]:"";
default_cursor = desktop_data[selected_desktop, "cursor"]:"";
- }
- else
- {
+
+ // KDE, GNOME CD ... or desktop just not set at all
+ } else {
list