Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory
checked in at Wed Apr 1 17:35:37 CEST 2009.
--------
--- yast2/yast2.changes 2009-02-24 18:32:15.000000000 +0100
+++ yast2/yast2.changes 2009-03-26 18:55:29.000000000 +0100
@@ -1,0 +2,38 @@
+Wed Mar 25 16:41:53 CET 2009 - lslezak@suse.cz
+
+- Fixed layout of the authentication popup
+
+-------------------------------------------------------------------
+Tue Mar 17 20:05:45 CET 2009 - lslezak@suse.cz
+
+- moved functions RunCommandWithTimeout() and RunDumbTimeout()
+ from SourceManager.ycp to Misc.ycp
+
+-------------------------------------------------------------------
+Tue Mar 17 12:42:56 CET 2009 - jsrain@suse.cz
+
+- fixed typo (bnc #483915)
+- report when GTK UI is wanted but not installed (bnc #472448)
+
+-------------------------------------------------------------------
+Mon Mar 16 10:03:31 CET 2009 - ug@suse.de
+
+- docu for Popup::ShowTextTimed fixed
+
+-------------------------------------------------------------------
+Fri Mar 06 12:15:09 CET 2009 - aschnell@suse.de
+
+- added Event.ycp to easy use of UI events
+- 2.18.13
+
+-------------------------------------------------------------------
+Fri Mar 6 09:03:14 CET 2009 - jsrain@suse.cz
+
+- fixed textdomain
+
+-------------------------------------------------------------------
+Thu Mar 5 09:23:43 CET 2009 - jsuchome@suse.cz
+
+- GPG.ycp: --batch option is needed for hiding password popup
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-2.18.12.tar.bz2
New:
----
yast2-2.18.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.J32086/_old 2009-04-01 17:32:10.000000000 +0200
+++ /var/tmp/diff_new_pack.J32086/_new 2009-04-01 17:32:10.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.18.12)
+# spec file for package yast2 (Version 2.18.13)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,24 +19,24 @@
Name: yast2
-Version: 2.18.12
+Version: 2.18.13
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.18.12.tar.bz2
+Source0: yast2-2.18.13.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
# Needed already in build time
-BuildRequires: yast2-core >= 2.17.1 yast2-pkg-bindings >= 2.17.32
+BuildRequires: yast2-core >= 2.17.1 yast2-pkg-bindings >= 2.17.32 yast2-ycp-ui-bindings >= 2.18.4
# pre-requires for filling the sysconfig template (sysconfig.yast2)
PreReq: %fillup_prereq
# y2base foo -S (hello) UI, list:: namespace
Requires: yast2-core >= 2.17.1
# Mod_UI
-# new YButtonBox widget (fate #303446)
-Requires: yast2-ycp-ui-bindings >= 2.17.8
+# new UI::OpenContextMenu
+Requires: yast2-ycp-ui-bindings >= 2.18.4
# Pkg::Get(Set)SolverFlags()
Requires: yast2-pkg-bindings >= 2.17.32
Requires: yast2_ui yast2-branding
@@ -147,7 +147,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.18.12
+%setup -n yast2-2.18.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -251,6 +251,23 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Wed Mar 25 2009 lslezak@suse.cz
+- Fixed layout of the authentication popup
+* Tue Mar 17 2009 lslezak@suse.cz
+- moved functions RunCommandWithTimeout() and RunDumbTimeout()
+ from SourceManager.ycp to Misc.ycp
+* Tue Mar 17 2009 jsrain@suse.cz
+- fixed typo (bnc #483915)
+- report when GTK UI is wanted but not installed (bnc #472448)
+* Mon Mar 16 2009 ug@suse.de
+- docu for Popup::ShowTextTimed fixed
+* Fri Mar 06 2009 aschnell@suse.de
+- added Event.ycp to easy use of UI events
+- 2.18.13
+* Fri Mar 06 2009 jsrain@suse.cz
+- fixed textdomain
+* Thu Mar 05 2009 jsuchome@suse.cz
+- GPG.ycp: --batch option is needed for hiding password popup
* Tue Feb 24 2009 mzugec@suse.cz
- - NetworkInterfaces - possible to not use LABEL for aliases
(bnc#471253)
++++++ yast2-2.18.12.tar.bz2 -> yast2-2.18.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/configure new/yast2-2.18.13/configure
--- old/yast2-2.18.12/configure 2009-02-24 18:13:37.000000000 +0100
+++ new/yast2-2.18.13/configure 2009-03-26 18:54:49.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2 2.18.10.
+# Generated by GNU Autoconf 2.63 for yast2 2.18.13.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.18.10'
-PACKAGE_STRING='yast2 2.18.10'
+PACKAGE_VERSION='2.18.13'
+PACKAGE_STRING='yast2 2.18.13'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1277,7 +1277,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2 2.18.10 to adapt to many kinds of systems.
+\`configure' configures yast2 2.18.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1348,7 +1348,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.18.10:";;
+ short | recursive ) echo "Configuration of yast2 2.18.13:";;
esac
cat <<\_ACEOF
@@ -1428,7 +1428,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.18.10
+yast2 configure 2.18.13
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1442,7 +1442,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2 $as_me 2.18.10, which was
+It was created by yast2 $as_me 2.18.13, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2289,7 +2289,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.18.10'
+ VERSION='2.18.13'
cat >>confdefs.h <<_ACEOF
@@ -2513,7 +2513,7 @@
-VERSION="2.18.10"
+VERSION="2.18.13"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3574,7 +3574,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.18.10, which was
+This file was extended by yast2 $as_me 2.18.13, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3624,7 +3624,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2 config.status 2.18.10
+yast2 config.status 2.18.13
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/configure.in new/yast2-2.18.13/configure.in
--- old/yast2-2.18.12/configure.in 2009-02-24 18:13:22.000000000 +0100
+++ new/yast2-2.18.13/configure.in 2009-03-26 18:54:45.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.18.10, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.18.13, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.10"
+VERSION="2.18.13"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/library/control/src/InstError.ycp new/yast2-2.18.13/library/control/src/InstError.ycp
--- old/yast2-2.18.12/library/control/src/InstError.ycp 2009-02-13 18:49:26.000000000 +0100
+++ new/yast2-2.18.13/library/control/src/InstError.ycp 2009-03-06 09:03:17.000000000 +0100
@@ -11,7 +11,7 @@
*/
{
- textdomain "installation";
+ textdomain "base";
module "InstError";
import "Icon";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/library/gpg/src/GPG.ycp new/yast2-2.18.13/library/gpg/src/GPG.ycp
--- old/yast2-2.18.12/library/gpg/src/GPG.ycp 2008-04-10 08:47:39.000000000 +0200
+++ new/yast2-2.18.13/library/gpg/src/GPG.ycp 2009-03-05 09:24:25.000000000 +0100
@@ -307,7 +307,7 @@
}
// use the passphrase
- map out = callGPG(sformat("--detach-sign -u '%1' --no-tty --command-fd=0 %2 '%3' < '%4'", String::Quote(keyid), (ascii_signature ? "-a" : ""), String::Quote(file), String::Quote(tmpfile)));
+ map out = callGPG(sformat("--detach-sign -u '%1' --no-tty --batch --command-fd=0 --passphrase-fd 0 %2 '%3' < '%4'", String::Quote(keyid), (ascii_signature ? "-a" : ""), String::Quote(file), String::Quote(tmpfile)));
return out["exit"]:-1 == 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/library/modules/ContextMenu.ycp new/yast2-2.18.13/library/modules/ContextMenu.ycp
--- old/yast2-2.18.12/library/modules/ContextMenu.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.18.13/library/modules/ContextMenu.ycp 2009-03-07 12:32:38.000000000 +0100
@@ -0,0 +1,17 @@
+/**
+ * File: ContextMenu.ycp
+ * Package: yast2
+ * Summary: UI ContextMenu Helper
+ * Authors: Arvin Schnell
+ */
+{
+ module "ContextMenu";
+
+
+ global symbol Simple(list<term> items)
+ {
+ UI::OpenContextMenu(`menu(items));
+
+ return (symbol) UI::UserInput();
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/library/modules/Event.ycp new/yast2-2.18.13/library/modules/Event.ycp
--- old/yast2-2.18.12/library/modules/Event.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.18.13/library/modules/Event.ycp 2009-03-18 18:00:22.000000000 +0100
@@ -0,0 +1,142 @@
+/**
+ * File: Event.ycp
+ * Package: yast2
+ * Summary: UI Event Helpers
+ * Authors: Arvin Schnell
+ */
+{
+ module "Event";
+
+
+ /**
+ * Checks that the EventType is WidgetEvent and the EventReason is
+ * Activated.
+ *
+ * Returns id or nil.
+ */
+ global symbol IsWidgetActivated(map event)
+ {
+ if (event["EventType"]:"Unknown" != "WidgetEvent")
+ return nil;
+
+ if (event["EventReason"]:"Unknown" != "Activated")
+ return nil;
+
+ return event["ID"]:(symbol)(nil);
+ }
+
+
+ /**
+ * Checks that the EventType is WidgetEvent and the EventReason is
+ * SelectionChanged.
+ *
+ * Returns id or nil.
+ */
+ global symbol IsWidgetSelectionChanged(map event)
+ {
+ if (event["EventType"]:"Unknown" != "WidgetEvent")
+ return nil;
+
+ if (event["EventReason"]:"Unknown" != "SelectionChanged")
+ return nil;
+
+ return event["ID"]:(symbol)(nil);
+ }
+
+
+ /**
+ * Checks that the EventType is WidgetEvent and the EventReason is
+ * ValueChanged.
+ *
+ * Returns id or nil.
+ */
+ global symbol IsWidgetValueChanged(map event)
+ {
+ if (event["EventType"]:"Unknown" != "WidgetEvent")
+ return nil;
+
+ if (event["EventReason"]:"Unknown" != "ValueChanged")
+ return nil;
+
+ return event["ID"]:(symbol)(nil);
+ }
+
+
+ /**
+ * Checks that the EventType is WidgetEvent and the EventReason is
+ * Activated or SelectionChanged.
+ *
+ * Returns id or nil.
+ */
+ global symbol IsWidgetActivatedOrSelectionChanged(map event)
+ {
+ if (event["EventType"]:"Unknown" != "WidgetEvent")
+ return nil;
+
+ if ((event["EventReason"]:"Unknown" != "Activated") &&
+ (event["EventReason"]:"Unknown" != "SelectionChanged"))
+ return nil;
+
+ return event["ID"]:(symbol)(nil);
+ }
+
+
+ /**
+ * Checks that the EventType is WidgetEvent and the EventReason is
+ * ContextMenuActivated.
+ *
+ * Returns id or nil.
+ */
+ global symbol IsWidgetContextMenuActivated(map event)
+ {
+ if (event["EventType"]:"Unknown" != "WidgetEvent")
+ return nil;
+
+ if (event["EventReason"]:"Unknown" != "ContextMenuActivated")
+ return nil;
+
+ return event["ID"]:(symbol)(nil);
+ }
+
+
+ /**
+ * Checks that the EventType is MenuEvent.
+ *
+ * return id or nil.
+ */
+ global symbol IsMenu(map event)
+ {
+ if (event["EventType"]:"Unknown" != "MenuEvent")
+ return nil;
+
+ return event["ID"]:(symbol)(nil);
+ }
+
+
+ /**
+ * Checks that the EventType is TimeoutEvent.
+ *
+ * return id or nil.
+ */
+ global symbol IsTimeout(map event)
+ {
+ if (event["EventType"]:"Unknown" != "TimeoutEvent")
+ return nil;
+
+ return event["ID"]:(symbol)(nil);
+ }
+
+
+ /**
+ * Checks that the EventType is CancelEvent.
+ *
+ * return id or nil.
+ */
+ global symbol IsCancel(map event)
+ {
+ if (event["EventType"]:"Unknown" != "CancelEvent")
+ return nil;
+
+ return event["ID"]:(symbol)(nil);
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/library/modules/Misc.ycp new/yast2-2.18.13/library/modules/Misc.ycp
--- old/yast2-2.18.12/library/modules/Misc.ycp 2008-01-24 14:40:14.000000000 +0100
+++ new/yast2-2.18.13/library/modules/Misc.ycp 2009-03-17 20:32:08.000000000 +0100
@@ -6,12 +6,14 @@
* Purpose:
* miscellaneous definitions for installation
* Author: Klaus Kaempf
- * $Id: Misc.ycp 35071 2007-01-04 14:46:43Z locilka $
+ * $Id: Misc.ycp 56192 2009-03-17 19:32:08Z lslezak $
*/
{
module "Misc";
+ import "Mode";
+
/*
* Message after finishing installation and before the system
@@ -223,4 +225,122 @@
return ret;
}
+
+ /**
+ * Runs a bash command with timeout.
+ * @struct Returns map $[
+ * "exit" : int_return_code,
+ * "stdout" : [ "script", "stdout", "lines" ],
+ * "stderr" : [ "script", "stderr", "lines" ],
+ * ]
+ *
+ * @param run_command what to run
+ * @param log_command what to log (passwords masked)
+ * @param script_time_out in sec.
+ * @return map with out, err and ret_code
+ */
+ global map RunCommandWithTimeout (string run_command, string log_command, integer script_time_out) {
+ y2milestone("Running command \"%1\" in background...", log_command);
+
+ integer processID = (integer)SCR::Execute(.process.start_shell, run_command);
+
+ if (processID == 0) {
+ y2error("Cannot run '%1'", run_command);
+ return nil;
+ }
+
+ list<string> script_out = [];
+ list<string> script_err = [];
+ integer time_spent = 0;
+ integer return_code = nil;
+ boolean timed_out = false;
+ integer sleep_step = 200; // ms
+ script_time_out = script_time_out * 1000;
+
+ // while continuing is needed and while it is possible
+ while (! timed_out) {
+ boolean running = (boolean) SCR::Read(.process.running, processID);
+ // debugging #165821
+ if (time_spent % 100000 == 0) {
+ y2milestone ("running: %1", running);
+ string flag = "/tmp/SourceManagerTimeout";
+ if (SCR::Read (.target.size, flag) != -1) {
+ y2milestone ("Emergency exit");
+ SCR::Execute (.target.remove, flag);
+ break;
+ }
+ }
+
+ if (! running) {
+ break;
+ }
+
+ // at last, enable aborting the sync
+ if (Mode::commandline ()) {
+ sleep (sleep_step);
+ }
+ else {
+ any ui = UI::TimeoutUserInput (sleep_step);
+ if (ui == `abort) {
+ y2milestone ("aborted");
+ timed_out = true;
+ break;
+ }
+ }
+
+ // time-out
+ if (time_spent >= script_time_out) {
+ y2error("Command timed out after %1 msec", time_spent);
+ timed_out = true;
+ }
+
+ time_spent = time_spent + sleep_step;
+ }
+ y2milestone("Time spent: %1 msec", time_spent);
+
+ // fetching the return code if not timed-out
+ if (! timed_out) {
+ y2milestone ("getting output");
+ script_out = splitstring((string)SCR::Read(.process.read, processID), "\n");
+ y2milestone ("getting errors");
+ script_err = splitstring((string)SCR::Read(.process.read_stderr, processID), "\n");
+ y2milestone ("getting status");
+ return_code = (integer) SCR::Read(.process.status, processID);
+ }
+ y2milestone ("killing");
+ SCR::Execute(.process.kill, processID);
+
+ // release the process from the agent
+ SCR::Execute(.process.release, processID);
+
+ map command_ret = $[
+ "exit" : return_code,
+ "stdout" : script_out,
+ "stderr" : script_err,
+ ];
+ if (timed_out)
+ command_ret["timed_out"] = time_spent;
+ return command_ret;
+ }
+
+ /**
+ * Run
+ * - with a timeout
+ * - on dumb terminal to disable colors etc
+ * - using 'exit $?' because of buggy behavior '.background vs. ZMD' (FIXME still needed???)
+ * @param command a command
+ * @param log_command a command to log
+ * @param seconds timeout
+ * @return map with out, err and ret_code
+ */
+ global map RunDumbTimeout (string command, string log_command, integer seconds) {
+ string dumb_format = "export TERM=dumb; %1; exit $?";
+ string dumb_command = sformat (dumb_format, command);
+ string dumb_log_command = sformat (dumb_format, log_command);
+ // explicit export in case TERM was not in the environment
+ map ret = RunCommandWithTimeout (dumb_command, dumb_log_command, seconds);
+ if (ret == nil) ret = $[];
+ return ret;
+ }
+
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/library/modules/Popup.ycp new/yast2-2.18.13/library/modules/Popup.ycp
--- old/yast2-2.18.12/library/modules/Popup.ycp 2008-11-04 15:31:22.000000000 +0100
+++ new/yast2-2.18.13/library/modules/Popup.ycp 2009-03-16 10:04:30.000000000 +0100
@@ -7,7 +7,7 @@
* Arvin Schnell
* Flags: Stable
*
- * $Id: Popup.ycp 52252 2008-10-15 13:00:21Z locilka $
+ * $Id: Popup.ycp 56128 2009-03-16 09:04:30Z ug $
*
* Contains commonly used popup dialogs
* for general usage, e.g. Popup::YesNo(), Popup::ContinueCancel().
@@ -1542,7 +1542,7 @@
* @param text text to show
* @param timeout text to show
*
- * @example Popup::ShowText ("Boot Messages", "kernel panic");
+ * @example Popup::ShowText ("Boot Messages", "kernel panic", 10);
*/
global define void ShowTextTimed (string headline, string text,
integer timeout)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/library/modules/Version.ycp new/yast2-2.18.13/library/modules/Version.ycp
--- old/yast2-2.18.12/library/modules/Version.ycp 2009-02-24 18:25:22.000000000 +0100
+++ new/yast2-2.18.13/library/modules/Version.ycp 2009-03-26 18:54:58.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.18.12";
+global string yast2 = "2.18.13";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/library/packages/src/PackageCallbacks.ycp new/yast2-2.18.13/library/packages/src/PackageCallbacks.ycp
--- old/yast2-2.18.12/library/packages/src/PackageCallbacks.ycp 2009-01-26 09:25:36.000000000 +0100
+++ new/yast2-2.18.13/library/packages/src/PackageCallbacks.ycp 2009-03-25 16:43:11.000000000 +0100
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 54938 2009-01-23 12:34:35Z lslezak $
+ * $Id: PackageCallbacks.ycp 56393 2009-03-25 15:43:11Z lslezak $
*
*/
@@ -2454,10 +2454,10 @@
`HSpacing(1),
`VBox(
// textentry label
- `TextEntry(`id(`username), _("&User Name"), username),
+ `InputField(`id(`username), `opt(`hstretch), _("&User Name"), username),
`VSpacing(0.1),
// textentry label
- `Password(`id(`password), _("&Password"), password)
+ `Password(`id(`password), `opt(`hstretch), _("&Password"), password)
),
`HSpacing(1)
),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/library/packages/src/SlideShow.ycp new/yast2-2.18.13/library/packages/src/SlideShow.ycp
--- old/yast2-2.18.12/library/packages/src/SlideShow.ycp 2009-01-26 09:25:36.000000000 +0100
+++ new/yast2-2.18.13/library/packages/src/SlideShow.ycp 2009-03-17 12:36:29.000000000 +0100
@@ -6,7 +6,7 @@
* Author: Stefan Hundhammer
* Stanislav Visnovsky
*
- * $Id: SlideShow.ycp 54938 2009-01-23 12:34:35Z lslezak $
+ * $Id: SlideShow.ycp 56166 2009-03-17 11:36:29Z jsrain $
*
* Usage:
* This is a generic module for handling global progress bar with optional slideshow/release notes etc.
@@ -648,7 +648,7 @@
{
// Help text while software packages are being installed (displayed only in rare cases)
string help_text = _("<p>Please wait while packages are being installed.</p>")
- + _("<P><B>Aborting Installation</B>Package installation can be abored using the <B>Abort</B> button. However, the system then can be in a inconsistent or unusable state or it may not boot if a basic system component is not installed.</P>");
+ + _("<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>");
return help_text;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/library/wizard/src/Wizard.ycp new/yast2-2.18.13/library/wizard/src/Wizard.ycp
--- old/yast2-2.18.12/library/wizard/src/Wizard.ycp 2009-01-26 13:42:13.000000000 +0100
+++ new/yast2-2.18.13/library/wizard/src/Wizard.ycp 2009-03-05 17:30:39.000000000 +0100
@@ -622,7 +622,23 @@
*
* Analog to Wizard::UserInput.
**/
- global map WaitForEvent( integer timeout_millisec )
+ global map WaitForEvent()
+ {
+ map input = UI::WaitForEvent();
+
+ if (input["ID"]:nil == `accept) input["ID"] = `next;
+ if (input["ID"]:nil == `cancel) input["ID"] = `back;
+
+ return input;
+ }
+
+
+ /**
+ * Substitute for UI::WaitForEvent with timeout
+ *
+ * Analog to Wizard::UserInput.
+ **/
+ global map TimeoutWaitForEvent( integer timeout_millisec )
{
map input = UI::WaitForEvent( timeout_millisec );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/scripts/yast2 new/yast2-2.18.13/scripts/yast2
--- old/yast2-2.18.12/scripts/yast2 2009-02-13 18:49:26.000000000 +0100
+++ new/yast2-2.18.13/scripts/yast2 2009-03-17 12:43:58.000000000 +0100
@@ -172,7 +172,7 @@
if check_gtk; then
SELECTED_GUI=gtk
else
-# echo >&2 "GTK GUI wanted but not found, falling back to Qt."
+ echo >&2 "GTK GUI wanted but not found, falling back to Qt."
WANTED_GUI=qt
fi
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.12/VERSION new/yast2-2.18.13/VERSION
--- old/yast2-2.18.12/VERSION 2009-02-24 18:24:40.000000000 +0100
+++ new/yast2-2.18.13/VERSION 2009-03-06 12:16:47.000000000 +0100
@@ -1 +1 @@
-2.18.12
+2.18.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org