Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory
checked in at Tue Oct 19 02:35:21 CEST 2010.
--------
--- yast2/yast2.changes 2010-10-07 09:32:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2010-10-18 17:16:38.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Oct 18 15:04:37 UTC 2010 - lslezak@suse.cz
+
+- don't display extra error popup when a download fails, the error
+ is reported later via MediaChange callback anyway (bnc#625987)
+- 2.20.1
+
+-------------------------------------------------------------------
+Wed Oct 13 10:07:55 CEST 2010 - jsuchome@suse.cz
+
+- open LongError popup instead of Error if the message is too long
+ (bnc#611596)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-2.20.0.tar.bz2
New:
----
yast2-2.20.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.fP4DCy/_old 2010-10-19 02:35:13.000000000 +0200
+++ /var/tmp/diff_new_pack.fP4DCy/_new 2010-10-19 02:35:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.20.0)
+# spec file for package yast2 (Version 2.20.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2
-Version: 2.20.0
+Version: 2.20.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.20.0.tar.bz2
+Source0: yast2-2.20.1.tar.bz2
Prefix: /usr
@@ -128,7 +128,7 @@
installation with YaST2.
%prep
-%setup -n yast2-2.20.0
+%setup -n yast2-2.20.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-2.20.0.tar.bz2 -> yast2-2.20.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.0/VERSION new/yast2-2.20.1/VERSION
--- old/yast2-2.20.0/VERSION 2010-10-07 09:21:53.000000000 +0200
+++ new/yast2-2.20.1/VERSION 2010-10-18 17:06:49.000000000 +0200
@@ -1 +1 @@
-2.20.0
+2.20.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.0/configure new/yast2-2.20.1/configure
--- old/yast2-2.20.0/configure 2010-10-07 09:29:05.000000000 +0200
+++ new/yast2-2.20.1/configure 2010-10-18 17:11:35.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for yast2 2.20.0.
+# Generated by GNU Autoconf 2.67 for yast2 2.20.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -551,8 +551,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.20.0'
-PACKAGE_STRING='yast2 2.20.0'
+PACKAGE_VERSION='2.20.1'
+PACKAGE_STRING='yast2 2.20.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1224,7 +1224,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.20.0 to adapt to many kinds of systems.
+\`configure' configures yast2 2.20.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1295,7 +1295,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.20.0:";;
+ short | recursive ) echo "Configuration of yast2 2.20.1:";;
esac
cat <<\_ACEOF
@@ -1375,7 +1375,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.20.0
+yast2 configure 2.20.1
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1392,7 +1392,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.20.0, which was
+It was created by yast2 $as_me 2.20.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2322,7 +2322,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.20.0'
+ VERSION='2.20.1'
cat >>confdefs.h <<_ACEOF
@@ -2444,7 +2444,7 @@
-VERSION="2.20.0"
+VERSION="2.20.1"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3478,7 +3478,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.20.0, which was
+This file was extended by yast2 $as_me 2.20.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3531,7 +3531,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2 config.status 2.20.0
+yast2 config.status 2.20.1
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.0/configure.in new/yast2-2.20.1/configure.in
--- old/yast2-2.20.0/configure.in 2010-10-07 09:29:01.000000000 +0200
+++ new/yast2-2.20.1/configure.in 2010-10-18 17:11:31.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.20.0, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.20.1, 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.20.0"
+VERSION="2.20.1"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.0/library/modules/Popup.ycp new/yast2-2.20.1/library/modules/Popup.ycp
--- old/yast2-2.20.0/library/modules/Popup.ycp 2010-03-24 08:23:27.000000000 +0100
+++ new/yast2-2.20.1/library/modules/Popup.ycp 2010-10-18 17:04:20.000000000 +0200
@@ -7,7 +7,7 @@
* Arvin Schnell
* Flags: Stable
*
- * $Id: Popup.ycp 60396 2010-01-15 12:50:06Z aschnell $
+ * $Id: Popup.ycp 62627 2010-10-13 08:11:05Z jsuchome $
*
* Contains commonly used popup dialogs
* for general usage, e.g. Popup::YesNo(), Popup::ContinueCancel().
@@ -43,7 +43,11 @@
integer default_width = 60;
integer default_height = 10;
+// if error message is too long, show LongError instead of Error Popup
+global boolean switch_to_richtext = true;
+// lines of message text which force usage of RichText
+global integer too_many_lines = 20;
/**
* Internal function that returns a popup dialog with an additional label.
@@ -1272,7 +1276,11 @@
*/
global define void Error(string message)
{
- anyMessageInternal( Label::ErrorMsg(), message, Icon::IconPath ("error") );
+ list lines = splitstring (message, "\n");
+ if (switch_to_richtext && size (lines) > too_many_lines)
+ anyMessageInternalRich( Label::ErrorMsg(), message, Icon::IconPath ("error"), default_width, default_height );
+ else
+ anyMessageInternal( Label::ErrorMsg(), message, Icon::IconPath ("error") );
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.0/library/modules/Version.ycp new/yast2-2.20.1/library/modules/Version.ycp
--- old/yast2-2.20.0/library/modules/Version.ycp 2010-10-07 09:29:14.000000000 +0200
+++ new/yast2-2.20.1/library/modules/Version.ycp 2010-10-18 17:11:44.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.20.0";
+global string yast2 = "2.20.1";
/* EOF */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.0/library/packages/src/PackageCallbacks.ycp new/yast2-2.20.1/library/packages/src/PackageCallbacks.ycp
--- old/yast2-2.20.0/library/packages/src/PackageCallbacks.ycp 2010-10-07 09:28:24.000000000 +0200
+++ new/yast2-2.20.1/library/packages/src/PackageCallbacks.ycp 2010-10-18 17:11:27.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 62561 2010-10-07 07:28:23Z lslezak $
+ * $Id: PackageCallbacks.ycp 62648 2010-10-18 15:11:25Z lslezak $
*
*/
@@ -2074,10 +2074,14 @@
return true;
}
-
+ // just log the status, errors are handled in MediaChange callback
global void DoneDownload (integer error_value, string error_text)
{
- if (error_value != 0)
+ if (error_value == 0)
+ {
+ y2milestone("Download finished");
+ }
+ else
{
if (autorefreshing && autorefreshing_aborted)
{
@@ -2085,17 +2089,7 @@
}
else
{
- if (Mode::commandline()) {
- //error message, %1 is the cause for the error
- CommandLine::Print(sformat (_("Download failed:
- %1"), error_text));
- }
- else
- {
- // error message, %1 is the cause for the error
- Popup::Error (sformat (_("Download failed:
- %1"), error_text));
- }
+ y2warning("Download failed: error %1: %2", error_value, error_text);
}
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org