Hello community,
here is the log from the commit of package yast2-runlevel
checked in at Tue Mar 25 18:39:25 CET 2008.
--------
--- yast2-runlevel/yast2-runlevel.changes 2008-03-04 12:56:17.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-runlevel/yast2-runlevel.changes 2008-03-25 16:33:05.000000000 +0100
@@ -1,0 +2,13 @@
+Tue Mar 25 16:30:43 CET 2008 - locilka@suse.cz
+
+- Fixed exception in runlevel_proposal, sometimes both VNC and SSH
+ installation methods can be used together. Proposing runlevel (3
+ or 5) depending on the current UI (X: 5, Text: 3) (bnc #373604).
+- 2.16.2
+
+-------------------------------------------------------------------
+Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz
+
+- added 'StartupNotify=true' to the desktop file (bnc #304964)
+
+-------------------------------------------------------------------
Old:
----
yast2-runlevel-2.16.1.tar.bz2
New:
----
yast2-runlevel-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-runlevel.spec ++++++
--- /var/tmp/diff_new_pack.xG7044/_old 2008-03-25 18:26:43.000000000 +0100
+++ /var/tmp/diff_new_pack.xG7044/_new 2008-03-25 18:26:44.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-runlevel (Version 2.16.1)
+# spec file for package yast2-runlevel (Version 2.16.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-runlevel
-Version: 2.16.1
+Version: 2.16.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-runlevel-2.16.1.tar.bz2
+Source0: yast2-runlevel-2.16.2.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2
@@ -42,7 +42,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-runlevel-2.16.1
+%setup -n yast2-runlevel-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,13 @@
/usr/share/YaST2/schema/autoyast/rnc/runlevels.rnc
%doc %{prefix}/share/doc/packages/yast2-runlevel
%changelog
+* Tue Mar 25 2008 locilka@suse.cz
+- Fixed exception in runlevel_proposal, sometimes both VNC and SSH
+ installation methods can be used together. Proposing runlevel (3
+ or 5) depending on the current UI (X: 5, Text: 3) (bnc #373604).
+- 2.16.2
+* Mon Mar 17 2008 jsrain@suse.cz
+- added 'StartupNotify=true' to the desktop file (bnc #304964)
* Tue Mar 04 2008 locilka@suse.cz
- Using SetTitleIcon instead of SetDesktopIcon (bnc #366355).
- 2.16.1
++++++ yast2-runlevel-2.16.1.tar.bz2 -> yast2-runlevel-2.16.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.16.1/src/runlevel.desktop new/yast2-runlevel-2.16.2/src/runlevel.desktop
--- old/yast2-runlevel-2.16.1/src/runlevel.desktop 2007-05-30 08:09:38.000000000 +0200
+++ new/yast2-runlevel-2.16.2/src/runlevel.desktop 2008-03-19 11:39:58.000000000 +0100
@@ -23,3 +23,4 @@
Name=System Services (Runlevel)
GenericName=Configure runlevels
X-KDE-SubstituteUID=true
+StartupNotify=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.16.1/src/runlevel_proposal.ycp new/yast2-runlevel-2.16.2/src/runlevel_proposal.ycp
--- old/yast2-runlevel-2.16.1/src/runlevel_proposal.ycp 2007-08-29 15:05:49.000000000 +0200
+++ new/yast2-runlevel-2.16.2/src/runlevel_proposal.ycp 2008-03-25 16:33:21.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Default runlevel proposal
* Authors: Michal Svec
*
- * $Id: runlevel_proposal.ycp 40580 2007-08-29 13:05:49Z locilka $
+ * $Id: runlevel_proposal.ycp 45698 2008-03-25 15:33:21Z locilka $
*/
{
@@ -205,24 +205,34 @@
// check only what the user can change at this time
// Initially the module variables are nil so the condition triggers
- if (RunlevelEd::x11_selected != x11_selected ||
- force_reset)
- {
+ if (RunlevelEd::x11_selected != x11_selected || force_reset) {
// update parameters
RunlevelEd::x11_selected = x11_selected;
// do the proposal
if (! Mode::autoinst()) {
- RunlevelEd::default_runlevel = ((x11_needed && x11_selected) || vnc) ? "5": "3";
- // ssh installation, no X-configuration possible, #149071
- if (ssh) RunlevelEd::default_runlevel = "3";
+ // the default runlevel selection
+ RunlevelEd::default_runlevel = (x11_needed && x11_selected) ? "5":"3";
+
+ // Both VNC and SSH installation, let's assume that user wants
+ // to continue later using the same runlevel as it uses now
+ // bnc #373604
+ if (vnc && ssh) {
+ map display_info = UI::GetDisplayInfo();
+ // if currently installing in TextMode, 3 is selected, otherwise 5
+ RunlevelEd::default_runlevel = (display_info["TextMode"]:false == true) ? "3":"5";
+ // VNC installation
+ } else if (vnc) {
+ RunlevelEd::default_runlevel = "5";
+ // ssh installation, no X-configuration possible, bnc #149071
+ } else if (ssh) {
+ RunlevelEd::default_runlevel = "3";
+ }
}
if (forced_runlevel != "") {
RunlevelEd::default_runlevel = forced_runlevel;
}
-
-
}
// Bugzilla #166918
@@ -249,6 +259,8 @@
ret["warning_level"] = `warning;
ret["warning"] = "<ul>" + warning + "</ul>";
}
+
+ y2milestone ("Runlevel proposal: %1", ret);
}
/* run the module */
else if(func == "AskUser") {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.16.1/VERSION new/yast2-runlevel-2.16.2/VERSION
--- old/yast2-runlevel-2.16.1/VERSION 2008-03-04 12:56:36.000000000 +0100
+++ new/yast2-runlevel-2.16.2/VERSION 2008-03-25 16:33:13.000000000 +0100
@@ -1 +1 @@
-2.16.1
+2.16.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
