Mailinglist Archive: opensuse-commit (1194 mails)
| < Previous | Next > |
commit yast2
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 18 Mar 2008 14:17:15 +0100
- Message-id: <20080318131715.69706678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2
checked in at Tue Mar 18 14:17:15 CET 2008.
--------
--- yast2/yast2.changes 2008-03-14 15:27:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-03-18
13:24:55.000000000 +0100
@@ -1,0 +2,20 @@
+Tue Mar 18 13:22:01 CET 2008 - locilka@xxxxxxx
+
+- Changed the default value for use-automatic-configuration in
+ ProductControl module, now it's false (Also because of AutoYaST).
+- Better logging.
+- 2.16.38
+
+-------------------------------------------------------------------
+Mon Mar 17 14:50:16 CET 2008 - aschnell@xxxxxxx
+
+- added LogViewCore.ycp
+- added WaitForEvent to Wizard.ycp
+- 2.16.37
+
+-------------------------------------------------------------------
+Mon Mar 17 12:43:32 CET 2008 - jsrain@xxxxxxx
+
+- added 'StartupNotify=true' to the desktop file (bnc #304964)
+
+-------------------------------------------------------------------
Old:
----
yast2-2.16.36.tar.bz2
New:
----
yast2-2.16.38.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.n14650/_old 2008-03-18 14:17:00.000000000 +0100
+++ /var/tmp/diff_new_pack.n14650/_new 2008-03-18 14:17:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.36)
+# spec file for package yast2 (Version 2.16.38)
#
# 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
-Version: 2.16.36
+Version: 2.16.38
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.36.tar.bz2
+Source0: yast2-2.16.38.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools
yast2-perl-bindings yast2-testsuite
@@ -132,7 +132,7 @@
Steffen Winterfeldt <snwint@xxxxxxx>
%prep
-%setup -n yast2-2.16.36
+%setup -n yast2-2.16.38
%build
%{prefix}/bin/y2tool y2autoconf
@@ -236,6 +236,17 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Tue Mar 18 2008 locilka@xxxxxxx
+- Changed the default value for use-automatic-configuration in
+ ProductControl module, now it's false (Also because of AutoYaST).
+- Better logging.
+- 2.16.38
+* Mon Mar 17 2008 aschnell@xxxxxxx
+- added LogViewCore.ycp
+- added WaitForEvent to Wizard.ycp
+- 2.16.37
+* Mon Mar 17 2008 jsrain@xxxxxxx
+- added 'StartupNotify=true' to the desktop file (bnc #304964)
* Fri Mar 14 2008 locilka@xxxxxxx
- Several changes in ProductControl modules for automatic
configuration and easies enabling and disabling modules.
++++++ yast2-2.16.36.tar.bz2 -> yast2-2.16.38.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-2.16.36/library/control/src/ProductControl.ycp
new/yast2-2.16.38/library/control/src/ProductControl.ycp
--- old/yast2-2.16.36/library/control/src/ProductControl.ycp 2008-03-14
15:02:08.000000000 +0100
+++ new/yast2-2.16.38/library/control/src/ProductControl.ycp 2008-03-18
13:25:15.000000000 +0100
@@ -7,7 +7,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Lukas Ocilka <locilka@xxxxxxx>
*
- * $Id: ProductControl.ycp 45465 2008-03-14 14:02:08Z locilka $
+ * $Id: ProductControl.ycp 45549 2008-03-18 12:25:14Z locilka $
*/
{
textdomain "base";
@@ -615,6 +615,12 @@
global void UnDisableAllModulesAndProposals (string mode, string stage) {
map this_workflow = $["mode":mode, "stage":stage];
+ // Such mode/stage not disabled
+ if (! contains (already_disabled_workflows, this_workflow)) {
+ y2milestone ("Not yet disabled, not un-disabling: %1", this_workflow);
+ return;
+ }
+
y2milestone ("Un-Disabling workflow %1", this_workflow);
already_disabled_workflows = filter (map one_workflow,
already_disabled_workflows, {
return (one_workflow != this_workflow);
@@ -747,8 +753,26 @@
// Installation without second stage
// "Automatic Configuration"
-// FIXME: read the default value from control file
-boolean use_automatic_configuration = true;
+boolean use_automatic_configuration = nil;
+
+/**
+ * Inits the default value for use_automatic_configuration
+ */
+void InitAutomaticConfiguration () {
+ if (use_automatic_configuration != nil)
+ return;
+
+ // AytoYaST default - not to use Automatic configuration at all
+ if (Mode::autoinst() || Mode::config()) {
+ use_automatic_configuration = false;
+ // The rest is on user
+ // FIXME: read the default value from control file
+ } else {
+ use_automatic_configuration = false;
+ }
+
+ y2milestone ("Default 'UseAutomaticConfiguration': %1",
use_automatic_configuration);
+}
/**
* Adjust the automatic configuration to be either enabled or disabled.
@@ -763,6 +787,8 @@
}
use_automatic_configuration = set_param;
+
+ y2milestone ("UseAutomaticConfiguration has been set to: %1",
use_automatic_configuration);
}
/**
@@ -771,6 +797,9 @@
* @return boolean if enabled
*/
global boolean GetUseAutomaticConfiguration () {
+ // lazy loading
+ InitAutomaticConfiguration();
+
return use_automatic_configuration;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-2.16.36/library/log/src/LogViewCore.ycp
new/yast2-2.16.38/library/log/src/LogViewCore.ycp
--- old/yast2-2.16.36/library/log/src/LogViewCore.ycp 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-2.16.38/library/log/src/LogViewCore.ycp 2008-03-18
12:56:22.000000000 +0100
@@ -0,0 +1,156 @@
+/**
+ * File: modules/LogViewCore.ycp
+ * Package: YaST2
+ * Summary: Displaying a log
+ * Authors: Jiri Srain <jsrain@xxxxxxx>
+ * Arvin Schnell <aschnell@xxxxxxx>
+ *
+ * $Id: LogViewCore.ycp 45503 2008-03-17 09:46:23Z aschnell $
+ */
+{
+ module "LogViewCore.ycp";
+
+ textdomain "base";
+
+
+ import "Report";
+
+
+ /**
+ * default value of maximum displayed lines
+ */
+ integer max_lines_default = 100;
+
+
+ /**
+ * lines of the log
+ */
+ list<string> lines = [];
+
+
+ /**
+ * data describing log: file, grep, command, max_lines etc.
+ */
+ map<string, any> data = $[];
+
+
+ /**
+ * id of background process
+ */
+ integer id = 0;
+
+
+ /**
+ * Remove unneeded items from a list of lines
+ * If max_lines is 0, then don't remove anything
+ */
+ void DeleteOldLines()
+ {
+ integer max_lines = data["max_lines"]:max_lines_default;
+
+ if (max_lines == 0)
+ return;
+
+ integer sl = size (lines);
+ if (sl > max_lines)
+ {
+ lines = filter (string l, lines, {
+ sl = sl - 1;
+ return sl < max_lines;
+ });
+ }
+ }
+
+
+ /**
+ * Starts the log reading command via process agent.
+ *
+ * The LogView widget must exist when calling this function.
+ */
+ global void Start(map<string, any> d)
+ {
+ data = d;
+ lines = [];
+
+ integer max_lines = data["max_lines"]:max_lines_default;
+
+ string command = (string) data["command"]:nil;
+ if (command == nil || command == "")
+ {
+ string file = data["file"]:"";
+ if (file == nil || file == "")
+ {
+ // error report
+ Report::Error (_("Error occurred while reading the log."));
+ return;
+ }
+
+ string grep = data["grep"]:"";
+ if (grep != "" && grep != nil)
+ grep = sformat ("| grep --line-buffered '%1'", grep);
+ string lc_command = sformat ("cat '%1' %2 | wc -l",
data["file"]:"", grep);
+ map bash_output = (map) SCR::Execute (.target.bash_output,
lc_command);
+ command = sformat("tail -f -n +0 '%1'", data["file"]:"");
+ string addon = "";
+ if (bash_output["exit"]:1 == 0)
+ {
+ string lc = bash_output["stdout"]:"";
+ lc = filterchars (lc, "1234567890");
+ integer lines_count = tointeger (lc);
+ lines_count = lines_count - 2 * max_lines;
+ // don't know why without
+ // doubling it discards more lines, out of YaST2
+ // it works
+ if (max_lines != 0 && lines_count > 0)
+ addon = sformat ("| tail -n +%1", lines_count);
+ }
+ command = sformat ("%1 %2 %3", command, grep, addon);
+ }
+
+ y2milestone ("Calling background process with command %1", command);
+ id = (integer) SCR::Execute (.process.start_shell, command);
+
+ sleep (100);
+
+ while(true)
+ {
+ string line = (string) SCR::Read(.process.read_line, id);
+ if (line == nil)
+ break;
+
+ lines = add(lines, line);
+ }
+
+ DeleteOldLines();
+
+ UI::ChangeWidget(`id(data["widget"]:nil), `Value, mergestring (lines,
"\n") + "\n");
+ }
+
+
+ global void Update()
+ {
+ while(true)
+ {
+ string line = (string) SCR::Read(.process.read_line, id);
+ if (line == nil)
+ break;
+
+ lines = add(lines, line);
+ UI::ChangeWidget(`id(data["widget"]:nil), `LastLine, line + "\n");
+ }
+
+ DeleteOldLines();
+ }
+
+
+ global void Stop()
+ {
+ SCR::Execute(.process.kill, id);
+ }
+
+
+ global list<string> GetLines()
+ {
+ return lines;
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-2.16.36/library/log/src/LogView.ycp
new/yast2-2.16.38/library/log/src/LogView.ycp
--- old/yast2-2.16.36/library/log/src/LogView.ycp 2007-05-18
10:43:11.000000000 +0200
+++ new/yast2-2.16.38/library/log/src/LogView.ycp 2008-03-18
12:56:22.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Displaying a log with additional functionality
* Authors: Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: LogView.ycp 18863 2004-08-27 13:14:34Z arvin $
+ * $Id: LogView.ycp 45527 2008-03-17 13:32:04Z aschnell $
*
* All of these functions watch the log file and display
* added lines as the log grows.
@@ -23,6 +23,8 @@
* ],
* ]);
* </pre>
+ *
+ * TODO: Use LogViewCore.ycp
*/
{
@@ -640,7 +642,7 @@
* in the log (for getting relevant parts of
* /var/log/messages. If empty or not present, whole file
* is used
- * - "command" -- allows to specify comand to get the log for cases
+ * - "command" -- allows to specify command to get the log for cases
* where grep isn't enough. If used, file and grep entries
* are ignored
* - "save" -- boolean, if true, then log saving is possible
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-2.16.36/library/log/src/Makefile.am
new/yast2-2.16.38/library/log/src/Makefile.am
--- old/yast2-2.16.36/library/log/src/Makefile.am 2007-05-18
10:43:11.000000000 +0200
+++ new/yast2-2.16.38/library/log/src/Makefile.am 2008-03-18
12:56:22.000000000 +0100
@@ -1,7 +1,8 @@
# Makefile.am for yast2/library/log/src
module_DATA = \
- LogView.ycp
+ LogView.ycp \
+ LogViewCore.ycp
EXTRA_DIST = $(module_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-2.16.36/library/log/src/Makefile.in
new/yast2-2.16.38/library/log/src/Makefile.in
--- old/yast2-2.16.36/library/log/src/Makefile.in 2008-03-05
16:05:20.000000000 +0100
+++ new/yast2-2.16.38/library/log/src/Makefile.in 2008-03-18
13:25:46.000000000 +0100
@@ -178,7 +178,8 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
module_DATA = \
- LogView.ycp
+ LogView.ycp \
+ LogViewCore.ycp
EXTRA_DIST = $(module_DATA)
YCPCFLAGS = -M ../../modules -M ../../wizard/src -M ../../cwm/src -M
../../types/src
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-2.16.36/library/modules/Version.ycp
new/yast2-2.16.38/library/modules/Version.ycp
--- old/yast2-2.16.36/library/modules/Version.ycp 2008-03-14
15:28:04.000000000 +0100
+++ new/yast2-2.16.38/library/modules/Version.ycp 2008-03-18
13:25:31.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.36";
+global string yast2 = "2.16.38";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-2.16.36/library/wizard/src/Wizard.ycp
new/yast2-2.16.38/library/wizard/src/Wizard.ycp
--- old/yast2-2.16.36/library/wizard/src/Wizard.ycp 2008-03-05
16:03:55.000000000 +0100
+++ new/yast2-2.16.38/library/wizard/src/Wizard.ycp 2008-03-18
12:56:22.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Wizard dialog
* Authors: Stefan Hundhammer <sh@xxxxxxx>
*
- * $Id: Wizard.ycp 45222 2008-03-05 15:03:55Z locilka $
+ * $Id: Wizard.ycp 45545 2008-03-18 09:54:15Z aschnell $
*
* Provides the wizard dialog (common screen for all YaST2 installation
* modules) and functions to set the contents, to replace and restore
@@ -485,6 +485,38 @@
/**
+ * Substitute for UI::TimeoutUserInput
+ *
+ * Analogical to Wizard::UserInput.
+ **/
+ global any TimeoutUserInput(integer timeout_millisec)
+ {
+ any input = UI::TimeoutUserInput(timeout_millisec);
+
+ if ( input == `accept ) return `next;
+ if ( input == `cancel ) return `back;
+
+ return input;
+ }
+
+
+ /**
+ * Substitute for UI::WaitForEvent
+ *
+ * Analogical to Wizard::UserInput.
+ **/
+ global map WaitForEvent(integer timeout_millisec)
+ {
+ map input = UI::WaitForEvent(timeout_millisec);
+
+ if (input["ID"]:nil == `accept) input["ID"] = `next;
+ if (input["ID"]:nil == `cancel) input["ID"] = `back;
+
+ return input;
+ }
+
+
+ /**
* Create and open a typical installation wizard dialog.
*
* For backwards compatibility only - don't use this any more in new
modules.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-2.16.36/VERSION new/yast2-2.16.38/VERSION
--- old/yast2-2.16.36/VERSION 2008-03-14 15:27:40.000000000 +0100
+++ new/yast2-2.16.38/VERSION 2008-03-18 13:25:07.000000000 +0100
@@ -1 +1 @@
-2.16.36
+2.16.38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |