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 2022-04-30 00:45:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Sat Apr 30 00:45:05 2022 rev:162 rq:973242 version:4.5.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes
2022-04-26 20:17:16.100724367 +0200
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.1538/libstorage-ng.changes
2022-04-30 00:45:47.102964263 +0200
@@ -1,0 +2,7 @@
+Wed Apr 27 16:30:56 UTC 2022 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#871
+- handle parted version numbers from git checkouts
+- 4.5.6
+
+--------------------------------------------------------------------
Old:
----
libstorage-ng-4.5.5.tar.xz
New:
----
libstorage-ng-4.5.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.arjw1j/_old 2022-04-30 00:45:47.570964669 +0200
+++ /var/tmp/diff_new_pack.arjw1j/_new 2022-04-30 00:45:47.578964676 +0200
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.5.5
+Version: 4.5.6
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
++++++ libstorage-ng-4.5.5.tar.xz -> libstorage-ng-4.5.6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.5/VERSION
new/libstorage-ng-4.5.6/VERSION
--- old/libstorage-ng-4.5.5/VERSION 2022-04-25 11:14:49.000000000 +0200
+++ new/libstorage-ng-4.5.6/VERSION 2022-04-27 18:30:56.000000000 +0200
@@ -1 +1 @@
-4.5.5
+4.5.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.5/storage/Devices/PartitionImpl.cc
new/libstorage-ng-4.5.6/storage/Devices/PartitionImpl.cc
--- old/libstorage-ng-4.5.5/storage/Devices/PartitionImpl.cc 2022-04-25
11:14:49.000000000 +0200
+++ new/libstorage-ng-4.5.6/storage/Devices/PartitionImpl.cc 2022-04-27
18:30:56.000000000 +0200
@@ -1113,8 +1113,8 @@
switch (get_id())
{
case ID_LINUX:
- // this is tricky but parted has no clearer way - it also
fails if the
- // partition has a swap signature
+ // This is tricky but parted has no clearer way - it also
fails if the
+ // partition has a swap signature. TODO Use type-id and
type-uuid.
cmd_line += " set " + to_string(get_number()) + " lvm on
set " +
to_string(get_number()) + " lvm off";
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.5/storage/SystemInfo/CmdParted.cc
new/libstorage-ng-4.5.6/storage/SystemInfo/CmdParted.cc
--- old/libstorage-ng-4.5.5/storage/SystemInfo/CmdParted.cc 2022-04-25
11:14:49.000000000 +0200
+++ new/libstorage-ng-4.5.6/storage/SystemInfo/CmdParted.cc 2022-04-27
18:30:56.000000000 +0200
@@ -622,8 +622,8 @@
if (cmd.stdout().empty())
ST_THROW(SystemCmdException(&cmd, "failed to query parted
version"));
- // example versions: "3.4", "3.5"
- const regex version_rx("parted \\(GNU parted\\) ([0-9]+)\\.([0-9]+)",
+ // example versions: "3.4", "3.5", "3.5.1", "3.5.1-cec5"
+ const regex version_rx("parted \\(GNU parted\\)
([0-9]+)\\.([0-9]+)(\\.([0-9]+)(-([0-9a-z]+))?)?",
regex::extended);
smatch match;
@@ -633,8 +633,9 @@
major = stoi(match[1]);
minor = stoi(match[2]);
+ patchlevel = match[4].length() == 0 ? 0 : stoi(match[4]);
- y2mil("major:" << major << " minor:" << minor);
+ y2mil("major:" << major << " minor:" << minor << " patchlevel:" <<
patchlevel);
did_query_version = true;
}
@@ -660,5 +661,6 @@
int PartedVersion::major = 0;
int PartedVersion::minor = 0;
+ int PartedVersion::patchlevel = 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.5/storage/SystemInfo/CmdParted.h
new/libstorage-ng-4.5.6/storage/SystemInfo/CmdParted.h
--- old/libstorage-ng-4.5.5/storage/SystemInfo/CmdParted.h 2022-04-25
11:14:49.000000000 +0200
+++ new/libstorage-ng-4.5.6/storage/SystemInfo/CmdParted.h 2022-04-27
18:30:56.000000000 +0200
@@ -221,6 +221,7 @@
static int major;
static int minor;
+ static int patchlevel;
};
