Hello community,
here is the log from the commit of package yast2
checked in at Tue Mar 11 18:18:21 CET 2008.
--------
--- yast2/yast2.changes 2008-03-05 17:45:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-03-11 18:16:48.306233000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 11 13:00:07 CET 2008 - lslezak@suse.cz
+
+- improved String::FormatRateMessage() (needed for bnc#168935)
+- 2.16.34
+
+-------------------------------------------------------------------
Old:
----
yast2-2.16.33.tar.bz2
New:
----
yast2-2.16.34.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.i21338/_old 2008-03-11 18:17:35.000000000 +0100
+++ /var/tmp/diff_new_pack.i21338/_new 2008-03-11 18:17:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.33)
+# spec file for package yast2 (Version 2.16.34)
#
# 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.33
+Version: 2.16.34
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.33.tar.bz2
+Source0: yast2-2.16.34.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
%prep
-%setup -n yast2-2.16.33
+%setup -n yast2-2.16.34
%build
%{prefix}/bin/y2tool y2autoconf
@@ -235,7 +235,11 @@
%doc %{prefix}/share/doc/packages/yast2/system
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
+
%changelog
+* Tue Mar 11 2008 lslezak@suse.cz
+- improved String::FormatRateMessage() (needed for bnc#168935)
+- 2.16.34
* Wed Mar 05 2008 lslezak@suse.cz
- register Refresh callbacks (required for FATE #30962, bnc #231745)
- 2.16.33
++++++ yast2-2.16.33.tar.bz2 -> yast2-2.16.34.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.33/configure new/yast2-2.16.34/configure
--- old/yast2-2.16.33/configure 2008-03-05 17:44:46.000000000 +0100
+++ new/yast2-2.16.34/configure 2008-03-11 13:14:14.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2 2.16.33.
+# Generated by GNU Autoconf 2.61 for yast2 2.16.34.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.16.33'
-PACKAGE_STRING='yast2 2.16.33'
+PACKAGE_VERSION='2.16.34'
+PACKAGE_STRING='yast2 2.16.34'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1199,7 +1199,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.16.33 to adapt to many kinds of systems.
+\`configure' configures yast2 2.16.34 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1270,7 +1270,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.16.33:";;
+ short | recursive ) echo "Configuration of yast2 2.16.34:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.16.33
+yast2 configure 2.16.34
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1362,7 +1362,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.16.33, which was
+It was created by yast2 $as_me 2.16.34, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2183,7 +2183,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.16.33'
+ VERSION='2.16.34'
cat >>confdefs.h <<_ACEOF
@@ -2411,7 +2411,7 @@
-VERSION="2.16.33"
+VERSION="2.16.34"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3412,7 +3412,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.16.33, which was
+This file was extended by yast2 $as_me 2.16.34, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3455,7 +3455,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.16.33
+yast2 config.status 2.16.34
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.33/configure.in new/yast2-2.16.34/configure.in
--- old/yast2-2.16.33/configure.in 2008-03-05 17:44:41.000000000 +0100
+++ new/yast2-2.16.34/configure.in 2008-03-11 13:14:10.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.16.33, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.34, 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.16.33"
+VERSION="2.16.34"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.33/library/control/src/ProductControl.ycp new/yast2-2.16.34/library/control/src/ProductControl.ycp
--- old/yast2-2.16.33/library/control/src/ProductControl.ycp 2008-02-27 08:48:02.000000000 +0100
+++ new/yast2-2.16.34/library/control/src/ProductControl.ycp 2008-03-07 09:22:37.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Product Control routines
* Authors: Anas Nashif
*
- * $Id: ProductControl.ycp 44820 2008-02-22 12:01:36Z jsuchome $
+ * $Id: ProductControl.ycp 45256 2008-03-06 09:17:18Z locilka $
*/
{
textdomain "base";
@@ -118,12 +118,25 @@
}
/**
- * DIsable given module from installation workflow
+ * Disable given module from installation workflow
* @return current list of disabled modules
*/
global list<string> DisableModule (string modname) {
+ if (modname == nil || modname == "") {
+ y2error ("Module to disable is '%1'", modname);
+ } else {
+ DisabledModules = (list<string>) union (DisabledModules, [modname]);
+ }
- DisabledModules = (list<string>) union (DisabledModules, [modname]);
+ return DisabledModules;
+}
+
+/**
+ * Returns list of modules disabled in workflow
+ *
+ * @return list <string> DisabledModules
+ */
+global list <string> GetDisabledModules () {
return DisabledModules;
}
@@ -134,6 +147,11 @@
*/
global define boolean checkDisabled (map mod )
{
+ if (mod == nil) {
+ y2error ("Unknown module %1", mod);
+ return nil;
+ }
+
if (contains(DisabledModules, mod["name"]:""))
{
return true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.33/library/modules/Version.ycp new/yast2-2.16.34/library/modules/Version.ycp
--- old/yast2-2.16.33/library/modules/Version.ycp 2008-03-05 17:44:55.000000000 +0100
+++ new/yast2-2.16.34/library/modules/Version.ycp 2008-03-11 13:14:24.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.33";
+global string yast2 = "2.16.34";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.33/library/types/src/String.ycp new/yast2-2.16.34/library/types/src/String.ycp
--- old/yast2-2.16.33/library/types/src/String.ycp 2007-05-18 12:48:10.000000000 +0200
+++ new/yast2-2.16.34/library/types/src/String.ycp 2008-03-11 13:13:53.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: String manipulation routines
* Authors: Michal Svec
*
- * $Id: String.ycp 37872 2007-05-09 11:49:45Z lslezak $
+ * $Id: String.ycp 45340 2008-03-11 12:13:53Z lslezak $
*/
{
@@ -162,7 +162,7 @@
*
* Add the current and the average download rate to the message.
*
- * @param text the message
+ * @param text the message with %1 placeholder for the download rate string
* @param avg_bps average download rate (in B/s)
* @param curr_bps current download rate (in B/s)
*
@@ -170,12 +170,26 @@
*/
global string FormatRateMessage(string text, integer avg_bps, integer curr_bps)
{
- // format download rate message
- // %1 - input message (e.g. "Downloading Package")
- // %2 - current download rate in B/s, KB/s...
- // %3 - average download rate since start
- // example - "Downloading Package - 237.34 KB/s (avg. 243.21 KB/s)"
- return sformat(_("%1 - %2 (avg. %3)"), text, FormatRate(curr_bps), FormatRate(avg_bps));
+ string rate = "";
+
+ if (curr_bps > 0)
+ {
+ rate = FormatRate(curr_bps);
+
+ if (avg_bps > 0)
+ {
+ // format download rate message: %1 = the current download rate (e.g. "242.6kB/s")
+ // %2 is the average download rate (e.g. "228.3kB/s")
+ // to translators: keep translation of "on average" as short as possible
+ rate = sformat(_("%1 (on average %2)"), rate, String::FormatRate(avg_bps));
+ }
+ }
+
+ // add download rate to the downloading message
+ // %1 is URL, %2 is formatted download rate, e.g. "242.6kB/s (avg. 228.3kB/s)"
+ // in ncurses UI the strings are exchanged (%1 is the rate, %2 is URL)
+ // due to limited space on the screen
+ return sformat(text, rate);
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.33/VERSION new/yast2-2.16.34/VERSION
--- old/yast2-2.16.33/VERSION 2008-03-05 17:43:34.000000000 +0100
+++ new/yast2-2.16.34/VERSION 2008-03-11 13:01:21.000000000 +0100
@@ -1 +1 @@
-2.16.33
+2.16.34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org