Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory
checked in at Fri Jul 10 16:47:34 CEST 2009.
--------
--- yast2/yast2.changes 2009-07-08 12:02:12.000000000 +0200
+++ yast2/yast2.changes 2009-07-09 14:19:11.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Jul 9 13:55:26 CEST 2009 - lslezak@suse.cz
+
+- Call UI::RecalcLayout() after changing push button label
+ (bnc#510282)
+- Improved automatic retry after download failure (more attepts,
+ logarithmic back-off, retry download in more cases) (bnc#119813)
+- 2.18.20
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-2.18.19.tar.bz2
New:
----
yast2-2.18.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.Dn2lLK/_old 2009-07-10 16:46:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Dn2lLK/_new 2009-07-10 16:46:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.18.19)
+# spec file for package yast2 (Version 2.18.20)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2
-Version: 2.18.19
+Version: 2.18.20
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.18.19.tar.bz2
+Source0: yast2-2.18.20.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
@@ -109,7 +109,7 @@
installation with YaST2.
%prep
-%setup -n yast2-2.18.19
+%setup -n yast2-2.18.20
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-2.18.19.tar.bz2 -> yast2-2.18.20.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.18.19/VERSION new/yast2-2.18.20/VERSION
--- old/yast2-2.18.19/VERSION 2009-07-08 11:29:39.000000000 +0200
+++ new/yast2-2.18.20/VERSION 2009-07-09 13:58:21.000000000 +0200
@@ -1 +1 @@
-2.18.19
+2.18.20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.18.19/configure new/yast2-2.18.20/configure
--- old/yast2-2.18.19/configure 2009-07-08 11:55:10.000000000 +0200
+++ new/yast2-2.18.20/configure 2009-07-09 14:16:15.000000000 +0200
@@ -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.19.
+# Generated by GNU Autoconf 2.63 for yast2 2.18.20.
#
# 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.19'
-PACKAGE_STRING='yast2 2.18.19'
+PACKAGE_VERSION='2.18.20'
+PACKAGE_STRING='yast2 2.18.20'
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.19 to adapt to many kinds of systems.
+\`configure' configures yast2 2.18.20 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.19:";;
+ short | recursive ) echo "Configuration of yast2 2.18.20:";;
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.19
+yast2 configure 2.18.20
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.19, which was
+It was created by yast2 $as_me 2.18.20, 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.19'
+ VERSION='2.18.20'
cat >>confdefs.h <<_ACEOF
@@ -2513,7 +2513,7 @@
-VERSION="2.18.19"
+VERSION="2.18.20"
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.19, which was
+This file was extended by yast2 $as_me 2.18.20, 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.19
+yast2 config.status 2.18.20
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.19/configure.in new/yast2-2.18.20/configure.in
--- old/yast2-2.18.19/configure.in 2009-07-08 11:55:06.000000000 +0200
+++ new/yast2-2.18.20/configure.in 2009-07-09 14:16:09.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.18.19, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.18.20, 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.19"
+VERSION="2.18.20"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.18.19/library/modules/Version.ycp new/yast2-2.18.20/library/modules/Version.ycp
--- old/yast2-2.18.19/library/modules/Version.ycp 2009-07-08 11:55:22.000000000 +0200
+++ new/yast2-2.18.20/library/modules/Version.ycp 2009-07-09 14:16:25.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.18.19";
+global string yast2 = "2.18.20";
/* EOF */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.18.19/library/packages/src/PackageCallbacks.ycp new/yast2-2.18.20/library/packages/src/PackageCallbacks.ycp
--- old/yast2-2.18.19/library/packages/src/PackageCallbacks.ycp 2009-04-30 15:12:25.000000000 +0200
+++ new/yast2-2.18.20/library/packages/src/PackageCallbacks.ycp 2009-07-09 14:16:00.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 57018 2009-04-29 07:17:31Z lslezak $
+ * $Id: PackageCallbacks.ycp 57975 2009-07-09 12:16:00Z lslezak $
*
*/
@@ -81,12 +81,16 @@
// seconds for automatic retry after a timeout
const integer retry_timeout = 30;
// number of automatic retries
- const integer retry_attempts = 3;
+ const integer retry_attempts = 100;
+ // max. retry timeout (15 minutes)
+ const integer retry_max_timeout = 15*60;
// current values for retry functionality
string retry_url = "";
integer current_retry_timeout = retry_timeout;
- integer current_retry_attempt = retry_attempts;
+ integer current_retry_attempt = 0;
+
+ const integer vsize_no_details = 1;
// functions related to the persistent storage
void LoadConfig()
@@ -175,6 +179,11 @@
return ret;
}
+ string RetryLabel(integer timeout)
+ {
+ return sformat(_("Remaining time to automatic retry: %1"), String::FormatTime(timeout));
+ }
+
/** at start of file providal
*
*/
@@ -251,9 +260,10 @@
`Left(`Label( message))
),
`VSpacing(0.1),
- `Left(`CheckBox(`id(`show), `opt(`notify),
+ `HBox(`HSpacing(0.6),
+ `Left(`CheckBox(`id(`show), `opt(`notify),
// check box
- _("Show &details"), info_on )),
+ _("Show &details"), info_on ))),
`VSpacing(0.4),
`HBox(`VSpacing(vertical_size),
`HSpacing(0.1),
@@ -280,7 +290,7 @@
else
{
UI::CloseDialog();
- UI::OpenDialog( `opt(`decorated), LayoutPopup (message, buttonbox, 2, false) );
+ UI::OpenDialog( `opt(`decorated), LayoutPopup (message, buttonbox, vsize_no_details, false) );
UI::ReplaceWidget(`id(`info), `Empty() );
}
return false;
@@ -378,7 +388,7 @@
}
else
{
- UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 2, false) );
+ UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, vsize_no_details, false) );
UI::ReplaceWidget(`id(`info), `Empty() );
}
@@ -598,7 +608,7 @@
}
else
{
- UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 2, false) );
+ UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, vsize_no_details, false) );
UI::ReplaceWidget(`id(`info), `Empty() );
}
@@ -874,27 +884,39 @@
// Autoretry code
boolean doing_auto_retry = false;
- if (error_code == "IO_SOFT")
+ if (error_code == "IO_SOFT" || contains(["ftp", "sftp", "http", "https", "nfs", "smb"], url_scheme))
{
// this a different file, reset the retry counter
if (retry_url != url)
{
retry_url = url;
- current_retry_attempt = retry_attempts;
+ current_retry_attempt = 0;
}
// is the maximum retry count reached?
- if (current_retry_attempt > 0)
+ if (current_retry_attempt < retry_attempts)
{
- // reset the counter
- current_retry_timeout = retry_timeout;
+ // reset the counter, use logarithmic back-off with maximum limit
+ current_retry_timeout = (current_retry_attempt < 10) ?
+ retry_timeout * (1 << current_retry_attempt) : retry_max_timeout;
+
+ if (current_retry_timeout > retry_max_timeout)
+ {
+ current_retry_timeout = retry_max_timeout;
+ }
+
button_box = `VBox(
- `Left(`Label(`id(`auto_retry), sformat(_("Automatically Retry After %1 Seconds"), current_retry_timeout))),
+ // failed download will be automatically retried after the timeout, %1 = formatted time (MM:SS format)
+ `Left(`Label(`id(`auto_retry), RetryLabel(current_retry_timeout))),
button_box
);
doing_auto_retry = true;
}
+ else
+ {
+ y2warning("Max. autoretry count (%1) reached, giving up...", retry_attempts);
+ }
}
y2milestone("Autoretry: %1", doing_auto_retry);
@@ -950,7 +972,7 @@
}
else
{
- UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 2, false) );
+ UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, vsize_no_details, false) );
UI::ReplaceWidget(`id(`info), `Empty() );
}
@@ -987,12 +1009,12 @@
r = `retry;
// decrease attempt counter
- current_retry_attempt = current_retry_attempt - 1;
+ current_retry_attempt = current_retry_attempt + 1;
}
else
{
// popup string - refresh the displayed counter
- UI::ChangeWidget(`id(`auto_retry), `Label, sformat(_("Automatically Retry After %1 Seconds"), current_retry_timeout));
+ UI::ChangeWidget(`id(`auto_retry), `Label, RetryLabel(current_retry_timeout));
}
}
else
@@ -2086,6 +2108,7 @@
{
// push button label
UI::ChangeWidget(`id(`abort), `Label, _("Skip Autorefresh"));
+ UI::RecalcLayout();
}
autorefreshing = true;
@@ -2097,6 +2120,7 @@
if (!Mode::commandline() && UI::WidgetExists(`id(`abort)))
{
UI::ChangeWidget(`id(`abort), `Label, Label::AbortButton());
+ UI::RecalcLayout();
}
y2milestone("Autorefresh done");
@@ -2365,7 +2389,7 @@
`PushButton (`id (`ignore), `opt (`okButton), Label::IgnoreButton())
);
- UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 1, false) );
+ UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, vsize_no_details, false) );
any r = nil;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org