Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libbytesize for openSUSE:Factory checked in at 2022-07-26 19:42:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libbytesize (Old) and /work/SRC/openSUSE:Factory/.libbytesize.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libbytesize" Tue Jul 26 19:42:11 2022 rev:7 rq:990739 version:2.7 Changes: -------- --- /work/SRC/openSUSE:Factory/libbytesize/libbytesize.changes 2021-11-12 15:59:10.054562237 +0100 +++ /work/SRC/openSUSE:Factory/.libbytesize.new.1533/libbytesize.changes 2022-07-26 19:42:16.719699373 +0200 @@ -1,0 +2,12 @@ +Thu Jul 14 16:57:49 UTC 2022 - Dirk M??ller <[email protected]> + +- update to 2.7: + * Fix skipping tests when required locale is missing + * Remove Travis CI configuration + * Fix some warnings and typos in docstrings and comments + * Fix warnings dicovered by the GCC analyzer + * build: avoid bashisms in configure + * Update translation files + * Do not use distutils to get Python library path + +------------------------------------------------------------------- Old: ---- libbytesize-2.6.tar.gz New: ---- libbytesize-2.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libbytesize.spec ++++++ --- /var/tmp/diff_new_pack.DALpSP/_old 2022-07-26 19:42:17.243618414 +0200 +++ /var/tmp/diff_new_pack.DALpSP/_new 2022-07-26 19:42:17.247617796 +0200 @@ -1,7 +1,7 @@ # # spec file for package libbytesize # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define somajor 1 %define libname %{name}%{somajor} Name: libbytesize -Version: 2.6 +Version: 2.7 Release: 0 Summary: A library for working with sizes in bytes License: LGPL-2.1-only ++++++ libbytesize-2.6.tar.gz -> libbytesize-2.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/configure new/libbytesize-2.7/configure --- old/libbytesize-2.6/configure 2021-07-07 12:15:46.000000000 +0200 +++ new/libbytesize-2.7/configure 2022-05-25 16:56:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libbytesize 2.6. +# Generated by GNU Autoconf 2.69 for libbytesize 2.7. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libbytesize' PACKAGE_TARNAME='libbytesize' -PACKAGE_VERSION='2.6' -PACKAGE_STRING='libbytesize 2.6' +PACKAGE_VERSION='2.7' +PACKAGE_STRING='libbytesize 2.7' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1360,7 +1360,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 libbytesize 2.6 to adapt to many kinds of systems. +\`configure' configures libbytesize 2.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1431,7 +1431,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libbytesize 2.6:";; + short | recursive ) echo "Configuration of libbytesize 2.7:";; esac cat <<\_ACEOF @@ -1554,7 +1554,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libbytesize configure 2.6 +libbytesize configure 2.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1923,7 +1923,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libbytesize $as_me 2.6, which was +It was created by libbytesize $as_me 2.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2821,7 +2821,7 @@ # Define the identity of the package. PACKAGE='libbytesize' - VERSION='2.6' + VERSION='2.7' cat >>confdefs.h <<_ACEOF @@ -13571,7 +13571,7 @@ fi - if test "x$python3" == "xno"; then : + if test "x$python3" = "xno"; then : if test "x$with_python3" = "xyes"; then if test x"$libbytesize_failure_messages" = x; then : libbytesize_failure_messages="Python3 support requested, but python3 is not available" @@ -13650,7 +13650,7 @@ fi - if test "x$gtkdoc_scan" == "xno"; then : + if test "x$gtkdoc_scan" = "xno"; then : if test "x$with_gtk_doc" = "xyes"; then if test x"$libbytesize_failure_messages" = x; then : libbytesize_failure_messages="Building documentation with gtk-doc requested, but not available" @@ -14288,7 +14288,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libbytesize $as_me 2.6, which was +This file was extended by libbytesize $as_me 2.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14345,7 +14345,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libbytesize config.status 2.6 +libbytesize config.status 2.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/configure.ac new/libbytesize-2.7/configure.ac --- old/libbytesize-2.6/configure.ac 2021-07-07 12:15:44.000000000 +0200 +++ new/libbytesize-2.7/configure.ac 2022-05-25 16:56:20.000000000 +0200 @@ -1,6 +1,6 @@ # configure.ac for libbytesize -AC_INIT([libbytesize], [2.6], [[email protected]]) +AC_INIT([libbytesize], [2.7], [[email protected]]) # Disable building static libraries. # This needs to be set before initializing automake @@ -59,7 +59,7 @@ AC_SUBST(WITH_PYTHON3, 0) if test "x$with_python3" != "xno"; then AC_PATH_PROG([python3], [python3], [no]) - AS_IF([test "x$python3" == "xno"], + AS_IF([test "x$python3" = "xno"], [if test "x$with_python3" = "xyes"; then LIBBYTESIZE_SOFT_FAILURE([Python3 support requested, but python3 is not available]) fi], @@ -77,7 +77,7 @@ AC_SUBST(WITH_GTK_DOC, 0) if test "x$with_gtk_doc" != "xno"; then AC_PATH_PROG([gtkdoc_scan], [gtkdoc-scan], [no]) - AS_IF([test "x$gtkdoc_scan" == "xno"], + AS_IF([test "x$gtkdoc_scan" = "xno"], [if test "x$with_gtk_doc" = "xyes"; then LIBBYTESIZE_SOFT_FAILURE([Building documentation with gtk-doc requested, but not available]) fi], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/dist/libbytesize.spec new/libbytesize-2.7/dist/libbytesize.spec --- old/libbytesize-2.6/dist/libbytesize.spec 2021-07-07 12:15:48.000000000 +0200 +++ new/libbytesize-2.7/dist/libbytesize.spec 2022-05-25 16:56:24.000000000 +0200 @@ -16,7 +16,7 @@ %define configure_opts %{?python3_opts} %{?tools_opts} Name: libbytesize -Version: 2.6 +Version: 2.7 Release: 1%{?dist} Summary: A library for working with sizes in bytes License: LGPLv2+ @@ -115,6 +115,19 @@ %endif %changelog +* Wed May 25 2022 Vojtech Trefny <[email protected]> - 2.7-1 +- Fix skipping tests when required locale is missing (vtrefny) +- Remove Travis CI configuration (vtrefny) +- Fix some warnings and typos in docstrings and comments (vtrefny) +- Fix warnings dicovered by the GCC analyzer (vtrefny) +- build: avoid bashisms in configure (sam) +- Update translation files (noreply) +- Translated using Weblate (Croatian) (linux.hr) +- Revert "Translations update from Weblate" (vtrefny) +- Update translation files (noreply) +- Added translation using Weblate (Croatian) (linux.hr) +- Do not use distutils to get Python library path (vtrefny) + * Wed Jul 07 2021 Vojtech Trefny <[email protected]> - 2.6-1 - Make sure Size can be interpreted as integer in Python 3.10 (vtrefny) - Translated using Weblate (Finnish) (ricky.tigg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/dist/libbytesize.spec.in new/libbytesize-2.7/dist/libbytesize.spec.in --- old/libbytesize-2.6/dist/libbytesize.spec.in 2021-07-07 12:15:44.000000000 +0200 +++ new/libbytesize-2.7/dist/libbytesize.spec.in 2022-05-25 16:56:20.000000000 +0200 @@ -16,7 +16,7 @@ %define configure_opts %{?python3_opts} %{?tools_opts} Name: libbytesize -Version: 2.6 +Version: 2.7 Release: 1%{?dist} Summary: A library for working with sizes in bytes License: LGPLv2+ @@ -115,6 +115,19 @@ %endif %changelog +* Wed May 25 2022 Vojtech Trefny <[email protected]> - 2.7-1 +- Fix skipping tests when required locale is missing (vtrefny) +- Remove Travis CI configuration (vtrefny) +- Fix some warnings and typos in docstrings and comments (vtrefny) +- Fix warnings dicovered by the GCC analyzer (vtrefny) +- build: avoid bashisms in configure (sam) +- Update translation files (noreply) +- Translated using Weblate (Croatian) (linux.hr) +- Revert "Translations update from Weblate" (vtrefny) +- Update translation files (noreply) +- Added translation using Weblate (Croatian) (linux.hr) +- Do not use distutils to get Python library path (vtrefny) + * Wed Jul 07 2021 Vojtech Trefny <[email protected]> - 2.6-1 - Make sure Size can be interpreted as integer in Python 3.10 (vtrefny) - Translated using Weblate (Finnish) (ricky.tigg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/docs/libbytesize-docs.xml new/libbytesize-2.7/docs/libbytesize-docs.xml --- old/libbytesize-2.6/docs/libbytesize-docs.xml 2021-07-07 12:15:48.000000000 +0200 +++ new/libbytesize-2.7/docs/libbytesize-docs.xml 2022-05-25 16:56:24.000000000 +0200 @@ -8,7 +8,7 @@ <bookinfo> <title>libbytesize Reference Manual</title> <releaseinfo> - for libbytesize 2.6. + for libbytesize 2.7. The latest version of this documentation can be found on-line at <ulink role="online-location" url="http://storaged.org/libbytesize";>http://storaged.org/libbytesize</ulink>. </releaseinfo> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/ltmain.sh new/libbytesize-2.7/ltmain.sh --- old/libbytesize-2.6/ltmain.sh 2021-07-07 12:15:00.000000000 +0200 +++ new/libbytesize-2.7/ltmain.sh 2022-05-25 16:55:55.000000000 +0200 @@ -2124,7 +2124,7 @@ # a configuration failure hint, and exit. func_fatal_configuration () { - func_fatal_error ${1+"$@"} \ + func__fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -2415,17 +2415,10 @@ # preserve --debug test : = "$debug_cmd" || func_append preserve_args " --debug" - case $host in - # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 - # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac + # Keeping compiler generated duplicates in $postdeps and $predeps is not + # harmful, and is necessary in a majority of systems that use it to satisfy + # symbol dependencies. + opt_duplicate_compiler_generated_deps=: $opt_help || { # Sanity checks first: @@ -7272,12 +7265,10 @@ # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/ast.po new/libbytesize-2.7/po/ast.po --- old/libbytesize-2.6/po/ast.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/ast.po 2022-03-25 12:22:05.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libbytesize 2.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2020-08-16 11:29+0000\n" "Last-Translator: Adolfo Jayme Barrientos <[email protected]>\n" "Language-Team: Asturian <https://translate.fedoraproject.org/projects/blivet/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/be.po new/libbytesize-2.7/po/be.po --- old/libbytesize-2.6/po/be.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/be.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2018-02-21 01:16+0000\n" "Last-Translator: Viktar Siarheichyk <[email protected]>\n" "Language-Team: Belarusian\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/bn_IN.po new/libbytesize-2.7/po/bn_IN.po --- old/libbytesize-2.6/po/bn_IN.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/bn_IN.po 2022-03-25 12:22:05.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libbytesize 2.2\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2020-06-25 15:40+0000\n" "Last-Translator: Akarshan Biswas <[email protected]>\n" "Language-Team: Bengali (India) <https://translate.fedoraproject.org/projects/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/ca.po new/libbytesize-2.7/po/ca.po --- old/libbytesize-2.6/po/ca.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/ca.po 2022-03-25 12:22:05.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2020-08-15 10:43+0000\n" "Last-Translator: Adolfo Jayme Barrientos <[email protected]>\n" "Language-Team: Catalan <https://translate.fedoraproject.org/projects/blivet/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/cs.po new/libbytesize-2.7/po/cs.po --- old/libbytesize-2.6/po/cs.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/cs.po 2022-03-25 12:22:05.000000000 +0100 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2016-03-07 11:45+0000\n" "Last-Translator: Vratislav Podzimek <[email protected]>\n" "Language-Team: Czech\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/da.po new/libbytesize-2.7/po/da.po --- old/libbytesize-2.6/po/da.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/da.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2017-04-24 09:35+0000\n" "Last-Translator: scootergrisen <[email protected]>\n" "Language-Team: Danish\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/de.po new/libbytesize-2.7/po/de.po --- old/libbytesize-2.6/po/de.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/de.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2017-04-11 06:50+0000\n" "Last-Translator: Robert Scheck <[email protected]>\n" "Language-Team: German\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/es.po new/libbytesize-2.7/po/es.po --- old/libbytesize-2.6/po/es.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/es.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2020-08-15 10:43+0000\n" "Last-Translator: Adolfo Jayme Barrientos <[email protected]>\n" "Language-Team: Spanish <https://translate.fedoraproject.org/projects/blivet/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/fi.po new/libbytesize-2.7/po/fi.po --- old/libbytesize-2.6/po/fi.po 2021-07-07 12:14:05.000000000 +0200 +++ new/libbytesize-2.7/po/fi.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2021-05-29 14:02+0000\n" "Last-Translator: Ricky Tigg <[email protected]>\n" "Language-Team: Finnish <https://translate.fedoraproject.org/projects/blivet/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/fr.po new/libbytesize-2.7/po/fr.po --- old/libbytesize-2.6/po/fr.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/fr.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2016-07-15 05:07+0000\n" "Last-Translator: Jean-Baptiste Holcroft <[email protected]>\n" "Language-Team: French\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/fur.po new/libbytesize-2.7/po/fur.po --- old/libbytesize-2.6/po/fur.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/fur.po 2022-03-25 12:22:05.000000000 +0100 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: libbytesize 2.2\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2019-08-12 07:14+0000\n" "Last-Translator: Fabio Tomat <[email protected]>\n" "Language-Team: Friulian\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/he.po new/libbytesize-2.7/po/he.po --- old/libbytesize-2.6/po/he.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/he.po 2022-03-25 12:22:05.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libbytesize 2.4\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2021-01-13 19:36+0000\n" "Last-Translator: Yaron Shahrabani <[email protected]>\n" "Language-Team: Hebrew <https://translate.fedoraproject.org/projects/blivet/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/hr.po new/libbytesize-2.7/po/hr.po --- old/libbytesize-2.6/po/hr.po 1970-01-01 01:00:00.000000000 +0100 +++ new/libbytesize-2.7/po/hr.po 2022-03-25 12:22:05.000000000 +0100 @@ -0,0 +1,105 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Red Hat, Inc. +# This file is distributed under the same license as the libbytesize package. +# Gogo Gogsi <[email protected]>, 2021. +msgid "" +msgstr "" +"Project-Id-Version: libbytesize 2.5\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" +"PO-Revision-Date: 2021-10-07 19:05+0000\n" +"Last-Translator: Gogo Gogsi <[email protected]>\n" +"Language-Team: Croatian <https://translate.fedoraproject.org/projects/blivet/"; +"libbytesize/hr/>\n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.8\n" + +#. TRANSLATORS: 'B' for bytes +#: src/bs_size.c:52 src/bs_size.c:73 +msgid "B" +msgstr "B" + +#. TRANSLATORS: abbreviation for kibibyte, 2**10 bytes +#: src/bs_size.c:54 +msgid "KiB" +msgstr "KiB" + +#. TRANSLATORS: abbreviation for mebibyte, 2**20 bytes +#: src/bs_size.c:56 +msgid "MiB" +msgstr "MiB" + +#. TRANSLATORS: abbreviation for gibibyte, 2**30 bytes +#: src/bs_size.c:58 +msgid "GiB" +msgstr "GiB" + +#. TRANSLATORS: abbreviation for tebibyte, 2**40 bytes +#: src/bs_size.c:60 +msgid "TiB" +msgstr "TiB" + +#. TRANSLATORS: abbreviation for pebibyte, 2**50 bytes +#: src/bs_size.c:62 +msgid "PiB" +msgstr "PiB" + +#. TRANSLATORS: abbreviation for exbibyte, 2**60 bytes +#: src/bs_size.c:64 +msgid "EiB" +msgstr "EiB" + +#. TRANSLATORS: abbreviation for zebibyte, 2**70 bytes +#: src/bs_size.c:66 +msgid "ZiB" +msgstr "ZiB" + +#. TRANSLATORS: abbreviation for yobibyte, 2**80 bytes +#: src/bs_size.c:68 +msgid "YiB" +msgstr "YiB" + +#. TRANSLATORS: abbreviation for kilobyte, 10**3 bytes +#: src/bs_size.c:75 +msgid "KB" +msgstr "KB" + +#. TRANSLATORS: abbreviation for megabyte, 10**6 bytes +#: src/bs_size.c:77 +msgid "MB" +msgstr "MB" + +#. TRANSLATORS: abbreviation for gigabyte, 10**9 bytes +#: src/bs_size.c:79 +msgid "GB" +msgstr "GB" + +#. TRANSLATORS: abbreviation for terabyte, 10**12 bytes +#: src/bs_size.c:81 +msgid "TB" +msgstr "TB" + +#. TRANSLATORS: abbreviation for petabyte, 10**15 bytes +#: src/bs_size.c:83 +msgid "PB" +msgstr "PB" + +#. TRANSLATORS: abbreviation for exabyte, 10**18 bytes +#: src/bs_size.c:85 +msgid "EB" +msgstr "EB" + +#. TRANSLATORS: abbreviation for zettabyte, 10**21 bytes +#: src/bs_size.c:87 +msgid "ZB" +msgstr "ZB" + +#. TRANSLATORS: abbreviation for yottabyte, 10**24 bytes +#: src/bs_size.c:89 +msgid "YB" +msgstr "YB" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/hu.po new/libbytesize-2.7/po/hu.po --- old/libbytesize-2.6/po/hu.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/hu.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2016-09-10 07:27+0000\n" "Last-Translator: Mesk?? Bal??zs <[email protected]>\n" "Language-Team: Hungarian\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/id.po new/libbytesize-2.7/po/id.po --- old/libbytesize-2.6/po/id.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/id.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2017-06-15 09:17+0000\n" "Last-Translator: Andika Triwidada <[email protected]>\n" "Language-Team: Indonesian\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/it.po new/libbytesize-2.7/po/it.po --- old/libbytesize-2.6/po/it.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/it.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2017-04-12 02:49+0000\n" "Last-Translator: Luca Ciavatta <[email protected]>\n" "Language-Team: Italian\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/ko.po new/libbytesize-2.7/po/ko.po --- old/libbytesize-2.6/po/ko.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/ko.po 2022-03-25 12:22:05.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libbytesize 2.5\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2021-03-08 20:01+0000\n" "Last-Translator: simmon <[email protected]>\n" "Language-Team: Korean <https://translate.fedoraproject.org/projects/blivet/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/libbytesize.pot new/libbytesize-2.7/po/libbytesize.pot --- old/libbytesize-2.6/po/libbytesize.pot 2021-07-07 12:15:48.000000000 +0200 +++ new/libbytesize-2.7/po/libbytesize.pot 2022-05-25 16:56:24.000000000 +0200 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: libbytesize 2.6\n" +"Project-Id-Version: libbytesize 2.7\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-07-07 12:15+0200\n" +"POT-Creation-Date: 2022-05-25 16:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/nl.po new/libbytesize-2.7/po/nl.po --- old/libbytesize-2.6/po/nl.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/nl.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2016-10-11 02:55+0000\n" "Last-Translator: Geert Warrink <[email protected]>\n" "Language-Team: Dutch\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/nn.po new/libbytesize-2.7/po/nn.po --- old/libbytesize-2.6/po/nn.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/nn.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2018-09-01 06:27+0000\n" "Last-Translator: Andreas-Johann ?? Ulvestad <[email protected]>\n" "Language-Team: Norwegian Nynorsk\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/pl.po new/libbytesize-2.7/po/pl.po --- old/libbytesize-2.6/po/pl.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/pl.po 2022-03-25 12:22:05.000000000 +0100 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2016-03-09 09:50+0000\n" "Last-Translator: Piotr Dr??g <[email protected]>\n" "Language-Team: Polish\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/pt.po new/libbytesize-2.7/po/pt.po --- old/libbytesize-2.6/po/pt.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/pt.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2019-09-16 03:58+0000\n" "Last-Translator: Manuela Silva <[email protected]>\n" "Language-Team: Portuguese\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/pt_BR.po new/libbytesize-2.7/po/pt_BR.po --- old/libbytesize-2.6/po/pt_BR.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/pt_BR.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2016-09-06 09:18+0000\n" "Last-Translator: Emerson Santos <[email protected]>\n" "Language-Team: Portuguese (Brazil)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/ru.po new/libbytesize-2.7/po/ru.po --- old/libbytesize-2.6/po/ru.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/ru.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2017-04-16 03:59+0000\n" "Last-Translator: Igor Gorbounov <[email protected]>\n" "Language-Team: Russian\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/si.po new/libbytesize-2.7/po/si.po --- old/libbytesize-2.6/po/si.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/si.po 2022-03-25 12:22:05.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libbytesize 2.4\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/sk.po new/libbytesize-2.7/po/sk.po --- old/libbytesize-2.6/po/sk.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/sk.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2016-10-11 05:59+0000\n" "Last-Translator: feonsu <[email protected]>\n" "Language-Team: Slovak\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/sq.po new/libbytesize-2.7/po/sq.po --- old/libbytesize-2.6/po/sq.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/sq.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2016-09-09 02:26+0000\n" "Last-Translator: Anxhela Hyseni <[email protected]>\n" "Language-Team: Albanian\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/sv.po new/libbytesize-2.7/po/sv.po --- old/libbytesize-2.6/po/sv.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/sv.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2017-03-30 04:12+0000\n" "Last-Translator: G??ran Uddeborg <[email protected]>\n" "Language-Team: Swedish\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/tr.po new/libbytesize-2.7/po/tr.po --- old/libbytesize-2.6/po/tr.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/tr.po 2022-03-25 12:22:05.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libbytesize 2.2\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2020-03-24 18:38+0000\n" "Last-Translator: O??uz Ersen <[email protected]>\n" "Language-Team: Turkish <https://translate.fedoraproject.org/projects/blivet/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/uk.po new/libbytesize-2.7/po/uk.po --- old/libbytesize-2.6/po/uk.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/uk.po 2022-03-25 12:22:05.000000000 +0100 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2016-03-11 08:12+0000\n" "Last-Translator: \n" "Language-Team: Ukrainian\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/zh_CN.po new/libbytesize-2.7/po/zh_CN.po --- old/libbytesize-2.6/po/zh_CN.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/zh_CN.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2017-04-11 05:28+0000\n" "Last-Translator: Charles Lee <[email protected]>\n" "Language-Team: Chinese (China)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/po/zh_TW.po new/libbytesize-2.7/po/zh_TW.po --- old/libbytesize-2.6/po/zh_TW.po 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/po/zh_TW.po 2022-03-25 12:22:05.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libbytesize 0.3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-01-27 14:58+0100\n" +"POT-Creation-Date: 2021-07-07 12:15+0200\n" "PO-Revision-Date: 2018-08-26 05:27+0000\n" "Last-Translator: Peter Pan <[email protected]>\n" "Language-Team: Chinese (Taiwan)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/src/bs_size.c new/libbytesize-2.7/src/bs_size.c --- old/libbytesize-2.6/src/bs_size.c 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/src/bs_size.c 2022-03-25 12:48:34.000000000 +0100 @@ -31,7 +31,7 @@ * #BSSize is a type that facilitates work with sizes in bytes by providing * functions/methods that are required for parsing users input when entering * size, showing size in nice human-readable format, storing sizes bigger than - * %UINT64_MAX and doing calculations with sizes without loss of + * UINT64_MAX and doing calculations with sizes without loss of * precision/information. The class is able to hold negative sizes and do * operations on/with them, but some of the (division and multiplication) * operations simply ignore the signs of the operands (check the documentation). @@ -128,7 +128,7 @@ /** * replace_char_with_str: (skip) * - * Replaces all apperances of @char in @str with @new. + * Replaces all appearances of @char in @str with @new. */ static char *replace_char_with_str (const char *str, char orig, const char *new) { uint64_t offset = 0; @@ -147,6 +147,8 @@ /* allocate space for the string [strlen(str)] with the char replaced by the string [strlen(new) - 1] $count times and a \0 byte at the end [ + 1] */ ret = malloc (sizeof(char) * (strlen(str) + (strlen(new) - 1) * count + 1)); + if (!ret) + return NULL; for (i=0; str[i]; i++) { if (str[i] == orig) @@ -189,6 +191,8 @@ new_len = strlen (new); ret_size = str_len + new_len - orig_len + 1; ret = malloc (sizeof(char) * ret_size); + if (!ret) + return NULL; memset (ret, 0, ret_size); memcpy (ret, str, pos - str); dest = ret + (pos - str); @@ -248,7 +252,7 @@ } /* not found among the binary and decimal units, let's try their translated - verions */ + versions */ for (bunit=BS_BUNIT_B; bunit < BS_BUNIT_UNDEF; bunit++) if (strncasecmp (unit_str, _(b_units[bunit-BS_BUNIT_B]), unit_str_len) == 0) { pwr = (uint64_t) bunit - BS_BUNIT_B; @@ -277,6 +281,10 @@ */ static void set_error (BSError **error, BSErrorCode code, char *msg) { *error = (BSError *) malloc (sizeof(BSError)); + if (*error == NULL) { + free (msg); + return; + } (*error)->code = code; (*error)->msg = msg; return; @@ -474,6 +482,11 @@ } loc_size_str = replace_char_with_str (size_str, '.', radix_char); + if (!loc_size_str) { + set_error (error, BS_ERROR_INVALID_SPEC, strdup_printf ("Failed to parse size spec: %s", size_str)); + pcre2_code_free (regex); + return NULL; + } str_len = strlen (loc_size_str); match_data = pcre2_match_data_create_from_pattern (regex, NULL); @@ -663,7 +676,7 @@ } if (!found_match) { - set_error (error, BS_ERROR_INVALID_SPEC, "Invalid unit spec given"); + set_error (error, BS_ERROR_INVALID_SPEC, strdup ("Invalid unit spec given")); mpf_clear (divisor); return NULL; } @@ -1234,7 +1247,7 @@ * functions. * * Returns: -1, 0, or 1 if @size1 is smaller, equal to or bigger than - * @size2 respectively comparing absolute values if @abs is %true + * @size2 respectively comparing absolute values if @abs is %TRUE */ int bs_size_cmp (const BSSize size1, const BSSize size2, bool abs) { int ret = 0; @@ -1258,7 +1271,7 @@ * @bytes. This function behaves like the standard *cmp*() functions. * * Returns: -1, 0, or 1 if @size is smaller, equal to or bigger than - * @bytes respectively comparing absolute values if @abs is %true + * @bytes respectively comparing absolute values if @abs is %TRUE */ int bs_size_cmp_bytes (const BSSize size, uint64_t bytes, bool abs) { int ret = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/src/python/Makefile.am new/libbytesize-2.7/src/python/Makefile.am --- old/libbytesize-2.6/src/python/Makefile.am 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/src/python/Makefile.am 2022-03-25 12:22:05.000000000 +0100 @@ -1,5 +1,5 @@ if WITH_PYTHON3 -py3libdir = $(shell python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") +py3libdir = $(shell python3 -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '${exec_prefix}'}))") py3bytesizedir = $(py3libdir)/bytesize dist_py3bytesize_DATA = bytesize.py __init__.py endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/src/python/Makefile.in new/libbytesize-2.7/src/python/Makefile.in --- old/libbytesize-2.6/src/python/Makefile.in 2021-07-07 12:15:46.000000000 +0200 +++ new/libbytesize-2.7/src/python/Makefile.in 2022-05-25 16:56:23.000000000 +0200 @@ -292,7 +292,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@WITH_PYTHON3_TRUE@py3libdir = $(shell python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") +@WITH_PYTHON3_TRUE@py3libdir = $(shell python3 -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '${exec_prefix}'}))") @WITH_PYTHON3_TRUE@py3bytesizedir = $(py3libdir)/bytesize @WITH_PYTHON3_TRUE@dist_py3bytesize_DATA = bytesize.py __init__.py MAINTAINERCLEANFILES = Makefile.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/tests/libbytesize_unittest.py new/libbytesize-2.7/tests/libbytesize_unittest.py --- old/libbytesize-2.6/tests/libbytesize_unittest.py 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/tests/libbytesize_unittest.py 2022-05-25 16:55:12.000000000 +0200 @@ -6,7 +6,7 @@ import sys import ctypes -from locale_utils import get_avail_locales, requires_locales +from locale_utils import get_avail_locales, missing_locales, requires_locales from bytesize import KiB, GiB, ROUND_UP, ROUND_DOWN, ROUND_HALF_UP, OverflowError @@ -26,8 +26,10 @@ unittest.TestCase.setUpClass() cls.avail_locales = get_avail_locales() - @requires_locales({DEFAULT_LOCALE}) def setUp(self): + missing = missing_locales({DEFAULT_LOCALE}, self.avail_locales) + if missing: + self.skipTest("requires missing locales: %s" % missing) locale.setlocale(locale.LC_ALL, DEFAULT_LOCALE) self.addCleanup(self._clean_up) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/tests/libbytesize_unittest.sh new/libbytesize-2.7/tests/libbytesize_unittest.sh --- old/libbytesize-2.6/tests/libbytesize_unittest.sh 2021-07-07 12:15:48.000000000 +0200 +++ new/libbytesize-2.7/tests/libbytesize_unittest.sh 2022-05-25 16:56:24.000000000 +0200 @@ -13,7 +13,7 @@ fi if [ 1 = 1 ]; then - python3 ${srcdir}/libbytesize_unittest.py fr_FR.UTF8 || status=1 + python3 ${srcdir}/libbytesize_unittest.py fr_FR.UTF-8 || status=1 fi exit $status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/tests/libbytesize_unittest.sh.in new/libbytesize-2.7/tests/libbytesize_unittest.sh.in --- old/libbytesize-2.6/tests/libbytesize_unittest.sh.in 2021-03-18 13:52:18.000000000 +0100 +++ new/libbytesize-2.7/tests/libbytesize_unittest.sh.in 2022-05-25 16:55:12.000000000 +0200 @@ -13,7 +13,7 @@ fi if [ @WITH_PYTHON3@ = 1 ]; then - python3 ${srcdir}/libbytesize_unittest.py fr_FR.UTF8 || status=1 + python3 ${srcdir}/libbytesize_unittest.py fr_FR.UTF-8 || status=1 fi exit $status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/tests/locale_utils.py new/libbytesize-2.7/tests/locale_utils.py --- old/libbytesize-2.6/tests/locale_utils.py 2020-07-31 08:20:38.000000000 +0200 +++ new/libbytesize-2.7/tests/locale_utils.py 2022-05-25 16:55:12.000000000 +0200 @@ -6,6 +6,12 @@ def get_avail_locales(): return {loc.decode(errors="replace").strip() for loc in subprocess.check_output(["locale", "-a"]).split()} + +def missing_locales(required, available): + canon_locales = {loc.replace("UTF-8", "utf8") for loc in required} + return canon_locales - set(available) + + def requires_locales(locales): """A decorator factory to skip tests that require unavailable locales @@ -16,10 +22,9 @@ """ - canon_locales = {loc.replace("UTF-8", "utf8") for loc in locales} def decorator(test_method): def decorated(test, *args): - missing = canon_locales - set(test.avail_locales) + missing = missing_locales(locales, test.avail_locales) if missing: test.skipTest("requires missing locales: %s" % missing) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/tools/bs_calc.py new/libbytesize-2.7/tools/bs_calc.py --- old/libbytesize-2.6/tools/bs_calc.py 2021-07-07 12:15:48.000000000 +0200 +++ new/libbytesize-2.7/tools/bs_calc.py 2022-05-25 16:56:24.000000000 +0200 @@ -93,7 +93,7 @@ def _main(): ap = ArgumentParser(epilog="Report issues at https://github.com/storaged-project/libbytesize/issues";) - ap.add_argument("--version", action="version", version="2.6") + ap.add_argument("--version", action="version", version="2.7") ap.add_argument("-u", "--unit", choices=(b_units + d_units), help="Unit to show the result in") ap.add_argument("-b", "-B", dest="unit", const="B", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbytesize-2.6/tools/bscalc.man new/libbytesize-2.7/tools/bscalc.man --- old/libbytesize-2.6/tools/bscalc.man 2021-07-07 12:20:28.000000000 +0200 +++ new/libbytesize-2.7/tools/bscalc.man 2022-05-25 16:59:45.000000000 +0200 @@ -1,7 +1,7 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.3. -.TH BSCALC "1" "July 2021" "bscalc 2.6" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. +.TH BSCALC "1" "May 2022" "bscalc 2.7" "User Commands" .SH NAME -bscalc \- manual page for bscalc 2.6 +bscalc \- manual page for bscalc 2.7 .SH DESCRIPTION usage: bscalc [\-h] [\-\-version] .IP @@ -12,7 +12,7 @@ .SS "positional arguments:" .IP EXPRESSION_PART -.SS "optional arguments:" +.SS "options:" .TP \fB\-h\fR, \fB\-\-help\fR show this help message and exit
