Author: locilka Date: Thu Nov 20 19:10:13 2008 New Revision: 53495 URL: http://svn.opensuse.org/viewcvs/yast?rev=53495&view=rev Log: - Pkg::SourceStartManager in inst_ask_online_update to replace obsolete Pkg::PkgEstablish (bnc #447080). - Reading all supported desktops to define the order of desktops in desktop_finish (bnc #446640). - Added shadow desktops to SLES and SLED desktop files to have a fallback if user selects some other desktop than the default one (bnc #446640). - 2.17.38 Modified: trunk/installation/VERSION trunk/installation/control/control.SLED.xml trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/desktop_finish.ycp trunk/installation/src/clients/inst_ask_online_update.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=53495&r1=53494&r2=53495&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Nov 20 19:10:13 2008 @@ -1 +1 @@ -2.17.37 +2.17.38 Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLED.xml?rev=53495&r1=53494&r2=53495&view=diff ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Thu Nov 20 19:10:13 2008 @@ -199,6 +199,69 @@ <patterns></patterns> <icon>pattern-gnome</icon> </one_supported_desktop> + + <!-- BNC 446640: The other desktops should be defined too as a fallback --> + <one_supported_desktop> + <name>kde</name> + <!-- BNC #381821, BNC #438212 --> + <desktop>startkde</desktop> + <label_id>dummy_desktop</label_id> + <logon>kdm4</logon> + <cursor>DMZ</cursor> + <packages>kde4-kdm</packages> + <order config:type="integer">1</order> + <patterns>kde x11 base</patterns> + <icon>pattern-kde4</icon> + </one_supported_desktop> + + <one_supported_desktop> + <name>kde3</name> + <!-- BNC #381821 --> + <desktop>startkde3</desktop> + <label_id>dummy_desktop</label_id> + <logon>kdm3</logon> + <cursor>DMZ</cursor> + <packages>kdebase3-kdm</packages> + <order config:type="integer">2</order> + <patterns>kde3 x11 base</patterns> + <icon>pattern-kde</icon> + </one_supported_desktop> + + <one_supported_desktop> + <name>xfce</name> + <desktop>startxfce4</desktop> + <label_id>dummy_desktop</label_id> + <logon>xdm</logon> + <cursor>DMZ</cursor> + <packages>xfce4-desktop</packages> + <order config:type="integer">4</order> + <patterns>xfce x11 base</patterns> + <icon>pattern-xfce</icon> + </one_supported_desktop> + + <one_supported_desktop> + <name>min_x</name> + <desktop>twm</desktop> + <label_id>dummy_desktop</label_id> + <logon>xdm</logon> + <cursor>DMZ</cursor> + <packages>xorg-x11</packages> + <order config:type="integer">6</order> + <patterns>x11 base</patterns> + <icon>yast-x11</icon> + </one_supported_desktop> + + <one_supported_desktop> + <name>textmode</name> + <desktop>twm</desktop> + <label_id>dummy_desktop</label_id> + <logon>xdm</logon> + <cursor>DMZ</cursor> + <packages>xorg-x11</packages> + <order config:type="integer">8</order> + <patterns>enhanced_base</patterns> + <icon>yast-sshd</icon> + </one_supported_desktop> </supported_desktops> <default_desktop>desktop_gnome</default_desktop> @@ -263,6 +326,7 @@ <!-- BNC #431336, Do not display any system type --> <desktop_gnome><label></label></desktop_gnome> + <dummy_desktop><label></label></dummy_desktop> <ac_1><label>Initialization...</label></ac_1> <ac_2><label>Configuring network...</label></ac_2> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=53495&r1=53494&r2=53495&view=diff ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Thu Nov 20 19:10:13 2008 @@ -164,6 +164,69 @@ <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 documentation</patterns> <icon>pattern-gnome</icon> </one_supported_desktop> + + <!-- BNC 446640: The other desktops should be defined too as a fallback --> + <one_supported_desktop> + <name>kde</name> + <!-- BNC #381821, BNC #438212 --> + <desktop>startkde</desktop> + <label_id>dummy_desktop</label_id> + <logon>kdm4</logon> + <cursor>DMZ</cursor> + <packages>kde4-kdm</packages> + <order config:type="integer">1</order> + <patterns>kde x11 base</patterns> + <icon>pattern-kde4</icon> + </one_supported_desktop> + + <one_supported_desktop> + <name>kde3</name> + <!-- BNC #381821 --> + <desktop>startkde3</desktop> + <label_id>dummy_desktop</label_id> + <logon>kdm3</logon> + <cursor>DMZ</cursor> + <packages>kdebase3-kdm</packages> + <order config:type="integer">2</order> + <patterns>kde3 x11 base</patterns> + <icon>pattern-kde</icon> + </one_supported_desktop> + + <one_supported_desktop> + <name>xfce</name> + <desktop>startxfce4</desktop> + <label_id>dummy_desktop</label_id> + <logon>xdm</logon> + <cursor>DMZ</cursor> + <packages>xfce4-desktop</packages> + <order config:type="integer">4</order> + <patterns>xfce x11 base</patterns> + <icon>pattern-xfce</icon> + </one_supported_desktop> + + <one_supported_desktop> + <name>min_x</name> + <desktop>twm</desktop> + <label_id>dummy_desktop</label_id> + <logon>xdm</logon> + <cursor>DMZ</cursor> + <packages>xorg-x11</packages> + <order config:type="integer">6</order> + <patterns>x11 base</patterns> + <icon>yast-x11</icon> + </one_supported_desktop> + + <one_supported_desktop> + <name>textmode</name> + <desktop>twm</desktop> + <label_id>dummy_desktop</label_id> + <logon>xdm</logon> + <cursor>DMZ</cursor> + <packages>xorg-x11</packages> + <order config:type="integer">8</order> + <patterns>enhanced_base</patterns> + <icon>yast-sshd</icon> + </one_supported_desktop> </supported_desktops> <default_desktop>gnome</default_desktop> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=53495&r1=53494&r2=53495&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Nov 20 19:10:13 2008 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Nov 20 18:21:32 CET 2008 - locilka@suse.cz + +- Pkg::SourceStartManager in inst_ask_online_update to replace + obsolete Pkg::PkgEstablish (bnc #447080). +- Reading all supported desktops to define the order of desktops + in desktop_finish (bnc #446640). +- Added shadow desktops to SLES and SLED desktop files to have + a fallback if user selects some other desktop than the default + one (bnc #446640). +- 2.17.38 + +------------------------------------------------------------------- Wed Nov 19 16:01:53 CET 2008 - locilka@suse.cz - Added pciutils to Requires, lspci was called but not required Modified: trunk/installation/src/clients/desktop_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/desktop_finish.ycp?rev=53495&r1=53494&r2=53495&view=diff ============================================================================== --- trunk/installation/src/clients/desktop_finish.ycp (original) +++ trunk/installation/src/clients/desktop_finish.ycp Thu Nov 20 19:10:13 2008 @@ -49,26 +49,11 @@ } else if (func == "Write") { - boolean doc_server = false; - // 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"))) - && - (!(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 dd_map = DefaultDesktop::GetAllDesktopsMap (); + map <string, map> dd_map = DefaultDesktop::GetAllDesktopsMap (); string selected_desktop = DefaultDesktop::Desktop(); y2milestone ("Selected desktop: %1", selected_desktop); @@ -80,8 +65,28 @@ string default_wm = ""; string default_cursor = ""; - // FIXME: list is not static anymore - list <string> desktop_order = [DefaultDesktop::Desktop(), "gnome", "kde", "kde3", "xfce", "min_x", "textmode"]; + list <string> desktop_order = []; + map <string, integer> dorder_map = $[]; + + // build a map $[desktop_id -> desktop_order] + foreach (string desktop_id, map desktop_def, dd_map, { + desktop_order = add (desktop_order, desktop_id); + + dorder_map[desktop_id] = (desktop_def["order"]:nil != nil ? + desktop_def["order"]:9999 + : + 9999 + ); + }); + + // sort the desktops according to their order + desktop_order = sort (string desktop_x, string desktop_y, desktop_order, + ``(dorder_map[desktop_x]:9999 < dorder_map[desktop_y]:9999) + ); + + // the default one is always the first one + desktop_order = prepend (desktop_order, DefaultDesktop::Desktop()); + y2milestone ("Desktop order: %1", desktop_order); boolean desktop_found = false; @@ -89,9 +94,11 @@ if (desktop_found) break; + y2milestone ("Checking desktop: %1", d); + foreach (string package, dd_map[d, "packages"]:[], { if (Pkg::IsProvided (package) && (Pkg::PkgInstalled (package) || Pkg::IsSelected (package))) { - y2milestone ("package %1 selected or installed", package); + y2milestone ("Package %1 selected or installed, desktop %2 matches", package, d); desktop_found = true; default_dm = dd_map[d, "logon"]:""; @@ -103,7 +110,7 @@ default_cursor = dd_map[d, "cursor"]:default_cursor; y2milestone ("Setting cursor theme %1 - package selected", default_cursor); } else { - y2milestone ("Package %1 for desktop %2 not selected or installed, trying next desktop...", package, d); + y2milestone ("Package %1 for desktop %2 neither selected nor installed, trying next desktop...", package, d); } }); }); @@ -165,13 +172,6 @@ y2milestone ("Command returned: %1", ret); } } - - - if (doc_server) - { - SCR::Write (.sysconfig.apache.DOC_SERVER, doc_server); - SCR::Write (.sysconfig.apache, nil); - } } else { Modified: trunk/installation/src/clients/inst_ask_online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ask_online_update.ycp?rev=53495&r1=53494&r2=53495&view=diff ============================================================================== --- trunk/installation/src/clients/inst_ask_online_update.ycp (original) +++ trunk/installation/src/clients/inst_ask_online_update.ycp Thu Nov 20 19:10:13 2008 @@ -1,5 +1,5 @@ /** - * File: installation/general/inst_ask_online_update.ycp + * File: clients/inst_ask_online_update.ycp * Module: Installation * Summary: Ask if the user wants to run an online update during installation * Authors: J. Daniel Schmidt <jdsn@suse.de> @@ -12,6 +12,8 @@ { textdomain "installation"; + // FIXME: move to yast2-registration later, it doesn't belog here + import "Wizard"; import "Popup"; import "GetInstArgs"; @@ -60,7 +62,8 @@ // check if there are some patches available - Pkg::PkgEstablish (); + // BNC #447080 + Pkg::SourceStartManager (true); integer selected = Pkg::ResolvableCountPatches (`affects_pkg_manager); y2milestone ("Available patches for pkg management: %1", selected); if (selected < 1) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org