Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libstorage-ng for openSUSE:Factory
checked in at 2023-09-10 13:09:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Sun Sep 10 13:09:37 2023 rev:238 rq:1109920 version:4.5.141
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes
2023-09-06 18:55:57.082763558 +0200
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.1766/libstorage-ng.changes
2023-09-10 13:10:07.798339453 +0200
@@ -1,0 +2,13 @@
+Sat Sep 9 03:30:04 UTC 2023 - bit...@opensuse.org
+
+- Translated using Weblate (Swedish) (bsc#1149754)
+- 4.5.141
+
+--------------------------------------------------------------------
+Thu Sep 7 14:08:15 UTC 2023 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#947
+- handle json output of btrfs version 6.5
+- 4.5.140
+
+--------------------------------------------------------------------
Old:
----
libstorage-ng-4.5.139.tar.xz
New:
----
libstorage-ng-4.5.141.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.BmVfne/_old 2023-09-10 13:10:08.918379469 +0200
+++ /var/tmp/diff_new_pack.BmVfne/_new 2023-09-10 13:10:08.918379469 +0200
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.5.139
+Version: 4.5.141
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
++++++ libstorage-ng-4.5.139.tar.xz -> libstorage-ng-4.5.141.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.139/LIBVERSION
new/libstorage-ng-4.5.141/LIBVERSION
--- old/libstorage-ng-4.5.139/LIBVERSION 2023-09-06 11:47:07.000000000
+0200
+++ new/libstorage-ng-4.5.141/LIBVERSION 2023-09-09 08:15:39.000000000
+0200
@@ -1 +1 @@
-1.91.1
+1.91.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.139/VERSION
new/libstorage-ng-4.5.141/VERSION
--- old/libstorage-ng-4.5.139/VERSION 2023-09-06 11:47:07.000000000 +0200
+++ new/libstorage-ng-4.5.141/VERSION 2023-09-09 08:15:39.000000000 +0200
@@ -1 +1 @@
-4.5.139
+4.5.141
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.139/po/sv.po
new/libstorage-ng-4.5.141/po/sv.po
--- old/libstorage-ng-4.5.139/po/sv.po 2023-09-06 11:47:07.000000000 +0200
+++ new/libstorage-ng-4.5.141/po/sv.po 2023-09-09 08:15:39.000000000 +0200
@@ -10,10 +10,10 @@
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-31 13:28+0200\n"
-"PO-Revision-Date: 2023-03-12 08:14+0000\n"
+"PO-Revision-Date: 2023-09-09 06:15+0000\n"
"Last-Translator: Luna Jernberg <bit...@opensuse.org>\n"
-"Language-Team: Swedish <https://l10n.opensuse.org/projects/libstorage/ng-";
-"master/sv/>\n"
+"Language-Team: Swedish <https://l10n.opensuse.org/projects/libstorage/";
+"ng-master/sv/>\n"
"Language: sv\n"
"MIME-Version: 1\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -404,9 +404,9 @@
# SLE12
#. TRANSLATORS: displayed before action,
#. %1$s is replaced by partition name (e.g. /dev/sda1)
-#, fuzzy, c-format
+#, c-format
msgid "Clear no-automount flag of partition %1$s"
-msgstr "Ta bort bootflagga för partitionen %1$s"
+msgstr "Ta bort ingen-automontering flagga för partition %1$s"
# SLE12
#. TRANSLATORS: displayed before action,
@@ -455,9 +455,9 @@
# SLE12
#. TRANSLATORS: displayed during action,
#. %1$s is replaced by partition name (e.g. /dev/sda1)
-#, fuzzy, c-format
+#, c-format
msgid "Clearing no-automount flag of partition %1$s"
-msgstr "Tar bort bootflagga för partitionen %1$s"
+msgstr "Tar bort ingen-automontering flagga för partition %1$s"
#. TRANSLATORS: displayed during action,
#. %1$s is replaced by the subvolume path (e.g. var/log),
@@ -3057,9 +3057,9 @@
#. TRANSLATORS: displayed before action,
#. %1$s is replaced by partition name (e.g. /dev/sda1)
-#, fuzzy, c-format
+#, c-format
msgid "Set no-automount flag of partition %1$s"
-msgstr "Ange bootflagga för partition %1$s"
+msgstr "Ställ in ingen-automontering flagga för partition %1$s"
#. TRANSLATORS: displayed before action,
#. %1$s is replaced by the subvolume path (e.g. var/log),
@@ -3179,9 +3179,9 @@
#. TRANSLATORS: displayed during action,
#. %1$s is replaced by partition name (e.g. /dev/sda1)
-#, fuzzy, c-format
+#, c-format
msgid "Setting no-automount flag of partition %1$s"
-msgstr "Anger bootflagga för partitionen %1$s"
+msgstr "Ställer in ingen-automontering flagga för partition %1$s"
#. TRANSLATORS: displayed during action,
#. %1$s is replaced by the subvolume path (e.g. var/log),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.139/storage/SystemInfo/CmdBtrfs.cc
new/libstorage-ng-4.5.141/storage/SystemInfo/CmdBtrfs.cc
--- old/libstorage-ng-4.5.139/storage/SystemInfo/CmdBtrfs.cc 2023-09-06
11:47:07.000000000 +0200
+++ new/libstorage-ng-4.5.141/storage/SystemInfo/CmdBtrfs.cc 2023-09-09
08:15:39.000000000 +0200
@@ -512,6 +512,32 @@
}
+ bool
+ CmdBtrfsQgroupShow::parse_limit(json_object* parent, const char* name,
+ std::optional<unsigned long long>& value)
const
+ {
+ // See JsonFile.cc for similar code.
+
+ json_object* child;
+
+ if (!json_object_object_get_ex(parent, name, &child))
+ return true;
+
+ if (json_object_is_type(child, json_type_null))
+ return true;
+
+ if (json_object_is_type(child, json_type_string) &&
strcmp(json_object_get_string(child), "none") == 0)
+ return true;
+
+ if (!json_object_is_type(child, json_type_int) &&
!json_object_is_type(child, json_type_string))
+ return false;
+
+ value = json_object_get_int64(child);
+
+ return true;
+ }
+
+
void
CmdBtrfsQgroupShow::parse_json(const vector<string>& lines)
{
@@ -538,17 +564,11 @@
if (!get_child_value(tmp2, "exclusive", entry.exclusive))
ST_THROW(Exception("\"exclusive\" not found or invalid"));
- if (!get_child_value(tmp2, "max_referenced", tmp3))
- ST_THROW(Exception("\"max_referenced\" not found"));
-
- if (tmp3 != "none")
- tmp3 >> entry.referenced_limit;
-
- if (!get_child_value(tmp2, "max_exclusive", tmp3))
- ST_THROW(Exception("\"max_exclusive\" not found"));
+ if (!parse_limit(tmp2, "max_referenced", entry.referenced_limit))
+ ST_THROW(Exception("\"max_referenced\" not found or invalid"));
- if (tmp3 != "none")
- tmp3 >> entry.exclusive_limit;
+ if (!parse_limit(tmp2, "max_exclusive", entry.exclusive_limit))
+ ST_THROW(Exception("\"max_exclusive\" not found or invalid"));
vector<json_object*> tmp4;
if (!get_child_nodes(tmp2, "parents", tmp4))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.139/storage/SystemInfo/CmdBtrfs.h
new/libstorage-ng-4.5.141/storage/SystemInfo/CmdBtrfs.h
--- old/libstorage-ng-4.5.139/storage/SystemInfo/CmdBtrfs.h 2023-09-06
11:47:07.000000000 +0200
+++ new/libstorage-ng-4.5.141/storage/SystemInfo/CmdBtrfs.h 2023-09-09
08:15:39.000000000 +0200
@@ -32,6 +32,7 @@
#include "storage/Filesystems/BtrfsSubvolumeImpl.h"
#include "storage/Filesystems/Btrfs.h"
#include "storage/Filesystems/BtrfsQgroupImpl.h"
+#include "storage/Utils/JsonFile.h"
namespace storage
@@ -273,6 +274,8 @@
void parse(const vector<string>& lines);
void parse_json(const vector<string>& lines);
+ bool parse_limit(json_object* parent, const char* name,
std::optional<unsigned long long>& value) const;
+
bool quota = false;
vector<Entry> data;
