Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Wed Jun 29 09:34:07 CEST 2011. mismatched tag at line 109, column 4, byte 3108: </script> </head> ===^ at /usr/lib/perl5/vendor_perl/5.10.0/x86_64-linux-thread-multi/XML/Parser.pm line 187 xargs: /work/src/bin/tools/get_bugzilla: exited with status 255; aborting -------- --- yast2/yast2.changes 2011-06-23 17:41:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2011-06-28 15:59:09.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 28 13:50:16 UTC 2011 - lslezak@suse.cz + +- Suppress decimal zeroes for kB sizes (e.g. display "743 kB" + instead of "743.00 kB") (bnc#495045) +- 2.21.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.21.3.tar.bz2 New: ---- yast2-2.21.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.HyWHp0/_old 2011-06-29 09:03:08.000000000 +0200 +++ /var/tmp/diff_new_pack.HyWHp0/_new 2011-06-29 09:03:08.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.21.3 +Version: 2.21.4 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.21.3.tar.bz2 +Source0: yast2-2.21.4.tar.bz2 Prefix: /usr @@ -130,7 +130,7 @@ installation with YaST2. %prep -%setup -n yast2-2.21.3 +%setup -n yast2-2.21.4 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.21.3.tar.bz2 -> yast2-2.21.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.3/VERSION new/yast2-2.21.4/VERSION --- old/yast2-2.21.3/VERSION 2011-06-23 17:39:34.000000000 +0200 +++ new/yast2-2.21.4/VERSION 2011-06-28 15:53:25.000000000 +0200 @@ -1 +1 @@ -2.21.3 +2.21.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.3/configure new/yast2-2.21.4/configure --- old/yast2-2.21.3/configure 2011-06-23 17:40:23.000000000 +0200 +++ new/yast2-2.21.4/configure 2011-06-28 15:58:06.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2 2.21.3. +# Generated by GNU Autoconf 2.68 for yast2 2.21.4. # # Report bugs to http://bugs.opensuse.org/. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.21.3' -PACKAGE_STRING='yast2 2.21.3' +PACKAGE_VERSION='2.21.4' +PACKAGE_STRING='yast2 2.21.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1232,7 +1232,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.21.3 to adapt to many kinds of systems. +`configure' configures yast2 2.21.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1303,7 +1303,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.21.3:";; + short | recursive ) echo "Configuration of yast2 2.21.4:";; esac cat <<_ACEOF @@ -1383,7 +1383,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -yast2 configure 2.21.3 +yast2 configure 2.21.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1400,7 +1400,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.21.3, which was +It was created by yast2 $as_me 2.21.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2330,7 +2330,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.21.3' + VERSION='2.21.4' cat >>confdefs.h <<_ACEOF @@ -2452,7 +2452,7 @@ -VERSION="2.21.3" +VERSION="2.21.4" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" @@ -3498,7 +3498,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.21.3, which was +This file was extended by yast2 $as_me 2.21.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3551,7 +3551,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.21.3 +yast2 config.status 2.21.4 configured by $0, generated by GNU Autoconf 2.68, with options \"$ac_cs_config\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.3/configure.in new/yast2-2.21.4/configure.in --- old/yast2-2.21.3/configure.in 2011-06-23 17:40:21.000000000 +0200 +++ new/yast2-2.21.4/configure.in 2011-06-28 15:58:02.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.21.3, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.21.4, 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.21.3" +VERSION="2.21.4" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.3/library/modules/Version.ycp new/yast2-2.21.4/library/modules/Version.ycp --- old/yast2-2.21.3/library/modules/Version.ycp 2011-06-23 17:40:27.000000000 +0200 +++ new/yast2-2.21.4/library/modules/Version.ycp 2011-06-28 15:58:14.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.21.3"; +global string yast2 = "2.21.4"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.3/library/network/src/CWMFirewallInterfaces.ycp new/yast2-2.21.4/library/network/src/CWMFirewallInterfaces.ycp --- old/yast2-2.21.3/library/network/src/CWMFirewallInterfaces.ycp 2010-03-24 08:23:27.000000000 +0100 +++ new/yast2-2.21.4/library/network/src/CWMFirewallInterfaces.ycp 2011-06-27 14:59:35.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routines for selecting interfaces opened in firewall * Authors: Jiri Srain <jsrain@suse.cz> * - * $Id: CWMFirewallInterfaces.ycp 60734 2010-02-08 14:26:10Z locilka $ + * $Id: CWMFirewallInterfaces.ycp 64592 2011-06-24 14:34:36Z jreidinger $ * * WARNING: If you want to use this functionality of this module * you should allways call 'SuSEFirewall::Read()' in the @@ -57,7 +57,7 @@ /** * Information if configuration was changed by user */ -boolean configuration_changed = nil; +boolean configuration_changed = false; /** * `Any`-feature is supported in the firewall configuration @@ -82,11 +82,6 @@ if (size (all_interfaces) == 0) enabled = false; - //// NetworkManager - //if (contains(all_interfaces, special_all_nm_interfaces) && enabled) { - // allowed_interfaces = add (allowed_interfaces, special_all_nm_interfaces); - //} - UI::ChangeWidget (`id ("_cwm_firewall_details"), `Enabled, enabled); } @@ -196,27 +191,6 @@ } any_iface_supported = SuSEFirewall::IsAnyNetworkInterfaceSupported(); - -// if (NetworkService::IsManaged()) { -// nm_managed = true; -// if (all_interfaces == nil) all_interfaces = []; -// all_interfaces = add (all_interfaces, special_all_nm_interfaces); -// -// if (interface_items == nil) interface_items = []; -// interface_items = add (interface_items, -// // multi selection box item -// `item (`id (special_all_nm_interfaces), _("All NetworkManager Interfaces")) -// ); -// -// // handled by NetworkManager and also any-feature is supported -// if (any_iface_supported) { -// nm_ifaces_have_to_be_supported = true; -// } else { -// nm_ifaces_have_to_be_supported = false; -// } -// } else { -// nm_managed = false; -// } } /** @@ -296,10 +270,6 @@ return i != nil; }); - //if (nm_ifaces_have_to_be_selected) { - // new_ifaces = toset(add(new_ifaces, special_all_nm_interfaces)); - //} - return toset (new_ifaces); } @@ -370,18 +340,6 @@ y2milestone ("Internal zone is protected or there are no interfaces in it"); } - //if (contains(all_interfaces, special_all_nm_interfaces)) { - // boolean special_all_nm_enabled = size(services) > 0; - // foreach (string sr, services, { - // if (! SuSEFirewall::IsServiceSupportedInZone (sr, SuSEFirewall::special_all_interface_zone)) { - // special_all_nm_enabled = false; - // break; - // } - // }); - // - // if (special_all_nm_enabled) allowed_interfaces = toset(add(allowed_interfaces, special_all_nm_interfaces)); - //} - configuration_changed = false; } @@ -405,13 +363,6 @@ SuSEFirewallProposal::SetChangedByUser(true); } - //boolean set_nm_enable = false; - //if (contains(allowed_interfaces, special_all_nm_interfaces)) { - // set_nm_enable = true; - // // to hide the special interface name - // allowed_interfaces = filter(string i, allowed_interfaces, { return i != special_all_nm_interfaces; }); - //} - list <string> interfaces_supported_by_any = SuSEFirewall::InterfacesSupportedByAnyFeature(SuSEFirewall::special_all_interface_zone); @@ -424,9 +375,6 @@ SuSEFirewall::SetServices (services, allowed_interfaces, true); } - //if (contains(all_interfaces, special_all_nm_interfaces)) { - // SuSEFirewall::SetServicesForZones(services, [SuSEFirewall::special_all_interface_zone], set_nm_enable); - //} } /** @@ -474,11 +422,6 @@ UI::ChangeWidget (`id ("_cwm_interface_list"), `SelectedItems, []); return nil; } - //if (contains((list <string>) UI::QueryWidget(`id ("_cwm_interface_list"), `SelectedItems), special_all_nm_interfaces)) { - // nm_ifaces_have_to_be_supported = true; - //} else { - // nm_ifaces_have_to_be_supported = false; - //} return nil; } @@ -491,7 +434,6 @@ global define void InterfacesStore (map<string,any> widget, string key, map event) { allowed_interfaces = (list<string>) UI::QueryWidget (`id ("_cwm_interface_list"), `SelectedItems); - //allowed_interfaces = Selected2Opened (allowed_interfaces, nm_ifaces_have_to_be_supported); allowed_interfaces = Selected2Opened (allowed_interfaces, false); configuration_changed = true; } @@ -549,26 +491,6 @@ } } - // NetworkManager interfaces have to be supported - //if (contains(ifaces, special_all_nm_interfaces)) { - // y2milestone("All Network Interfaces were selected."); - // if (any_iface_supported) { - // y2milestone("any-feature is supported."); - // } else { - // y2warning("any-feature is NOT supported."); - // // yes-no popup - // if (! Popup::YesNo ("Because of the SuSE Firewall settings, the port -//for All NetworkManager Interfaces cannot be open. - // -//Continue?")) return false; - // } - // - // nm_ifaces_have_to_be_supported = true; - // ifaces = filter (string i, ifaces, { return i != special_all_nm_interfaces; }); - //} else { - // nm_ifaces_have_to_be_supported = false; - //} - // list<string> firewall_ifaces = toset (Selected2Opened (ifaces, nm_ifaces_have_to_be_supported)); list<string> firewall_ifaces = toset (Selected2Opened (ifaces, false)); y2milestone("firewall_ifaces: %1", firewall_ifaces); @@ -583,8 +505,7 @@ }); y2milestone("removed_ifaces: %1", removed_ifaces); - //// to hide that special string - //added_ifaces = filter (string i, added_ifaces, { return i != special_all_nm_interfaces; }); + // to hide that special string if (size (added_ifaces) > 0) { string ifaces_list = mergestring (added_ifaces, "\n"); @@ -600,8 +521,7 @@ return false; } } - //// to hide that special string - //removed_ifaces = filter (string i, removed_ifaces, { return i != special_all_nm_interfaces; }); + // to hide that special string if (size (removed_ifaces) > 0) { string ifaces_list = mergestring (removed_ifaces, "\n"); @@ -634,8 +554,6 @@ if (new_status == false) return true; - // BTW: new_status == true - // 'any' in 'EXT' // interfaces are mentioned in some zone or they are covered by the special string // enable-on-all or disable-on-all will work diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.3/library/types/src/String.ycp new/yast2-2.21.4/library/types/src/String.ycp --- old/yast2-2.21.3/library/types/src/String.ycp 2009-06-11 18:48:31.000000000 +0200 +++ new/yast2-2.21.4/library/types/src/String.ycp 2011-06-28 15:57:31.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: String manipulation routines * Authors: Michal Svec <msvec@suse.cz> * - * $Id: String.ycp 57542 2009-06-11 16:48:30Z lslezak $ + * $Id: String.ycp 64618 2011-06-28 13:57:30Z lslezak $ */ { @@ -85,7 +85,7 @@ * (i.e. the result is language dependant). * * @param bytes size (e.g. free diskspace, memory size) in Bytes - * @param precision number of fraction digits in output + * @param precision number of fraction digits in output, if negative (less than 0) the precision is set automatically depending on the suffix * @param omit_zeroes if true then do not add zeroes * (useful for memory size - 128 MB RAM looks better than 128.00 MB RAM) * @return formatted string @@ -120,10 +120,32 @@ index = index + 1; } - if (precision == nil || precision < 0 || (omit_zeroes == true && (whole - tointeger(whole) == 0.0))) + if (precision == nil) { precision = 0; } + else if (precision < 0) + { + // auto precision - depends on the suffix, but max. 3 decimal digits + precision = (index <= 3) ? index : 3; + } + + if (omit_zeroes == true) + { + float max_difference = 0.9; + integer i = precision; + + while (i > 0) + { + max_difference = max_difference / 10; + i = i - 1; + } + + if (whole - tointeger(whole) < max_difference) + { + precision = 0; + } + } return float::tolstring(whole, precision) + " " + units[index]:""; } @@ -143,7 +165,10 @@ * @example FormatSize(23456767890) -> "223.70 MB" */ global define string FormatSize(integer bytes) ``{ - return FormatSizeWithPrecision(bytes, 2, false); + if (bytes == nil) return ""; + + // automatic precision, don't print trailing zeroes for sizes < 1MB + return FormatSizeWithPrecision(bytes, -1, bytes < 1<<20); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.3/library/types/testsuite/tests/String.out new/yast2-2.21.4/library/types/testsuite/tests/String.out --- old/yast2-2.21.3/library/types/testsuite/tests/String.out 2009-01-28 11:56:07.000000000 +0100 +++ new/yast2-2.21.4/library/types/testsuite/tests/String.out 2011-06-28 15:49:34.000000000 +0200 @@ -12,27 +12,33 @@ Return a'b'c Dump String::FormatSize Return -Return 0.00 B -Return 1.00 B -Return 1.00 kB +Return 0 B +Return 1 B +Return 1 kB +Return 1.1 kB +Return 743 kB Return 1.00 MB -Return 1.00 GB -Return 1.00 TB -Return 1024.09 TB +Return 1.000 GB +Return 1.000 TB +Return 1024.091 TB +Return 1 kB +Return 1.00 MB +Return 1.000 GB +Return 1.000 TB Dump String::FormatSizeWithPrecision Return Return 0 B Return 1.00 B Return 1.001 kB Return 1 MB -Return 1.00 MB +Return 1 MB Return 1 GB Return 1.000 GB Return 1.00 TB Return 1024.1 TB Return 4 kB Return 4.00 kB -Return 4.00 kB +Return 4 kB Return 8 GB Return 15.00000 B Return 21.846 GB diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.3/library/types/testsuite/tests/String.ycp new/yast2-2.21.4/library/types/testsuite/tests/String.ycp --- old/yast2-2.21.3/library/types/testsuite/tests/String.ycp 2009-01-28 11:56:07.000000000 +0100 +++ new/yast2-2.21.4/library/types/testsuite/tests/String.ycp 2011-06-28 15:49:59.000000000 +0200 @@ -22,10 +22,16 @@ TEST(``(String::FormatSize(0)), [], nil); TEST(``(String::FormatSize(1)), [], nil); TEST(``(String::FormatSize(1025)), [], nil); +TEST(``(String::FormatSize(1125)), [], nil); +TEST(``(String::FormatSize(743*1024)), [], nil); TEST(``(String::FormatSize(1049000)), [], nil); TEST(``(String::FormatSize(1074000000)), [], nil); TEST(``(String::FormatSize(1100000000000)), [], nil); TEST(``(String::FormatSize(1126000000000000)), [], nil); +TEST(``(String::FormatSize(1 << 10)), [], nil); +TEST(``(String::FormatSize(1 << 20)), [], nil); +TEST(``(String::FormatSize(1 << 30)), [], nil); +TEST(``(String::FormatSize(1 << 40)), [], nil); DUMP("String::FormatSizeWithPrecision"); TEST(``(String::FormatSizeWithPrecision(nil,nil,nil)), [], nil); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org