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-05-17 10:52:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng" Wed May 17 10:52:43 2023 rev:219 rq:1087377 version:4.5.105 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2023-05-13 17:17:40.686393831 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.1533/libstorage-ng.changes 2023-05-17 10:52:44.939223923 +0200 @@ -1,0 +2,14 @@ +Tue May 16 09:21:53 UTC 2023 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#931 +- added test programs for nvme list and list-subsys +- 4.5.105 + +-------------------------------------------------------------------- +Tue May 16 07:22:35 UTC 2023 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#930 +- avoid to handle some fstab entries twice +- 4.5.104 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.5.103.tar.xz New: ---- libstorage-ng-4.5.105.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.kpjo96/_old 2023-05-17 10:52:45.559227261 +0200 +++ /var/tmp/diff_new_pack.kpjo96/_new 2023-05-17 10:52:45.563227282 +0200 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.5.103 +Version: 4.5.105 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ libstorage-ng-4.5.103.tar.xz -> libstorage-ng-4.5.105.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/VERSION new/libstorage-ng-4.5.105/VERSION --- old/libstorage-ng-4.5.103/VERSION 2023-05-13 04:15:14.000000000 +0200 +++ new/libstorage-ng-4.5.105/VERSION 2023-05-16 11:21:53.000000000 +0200 @@ -1 +1 @@ -4.5.103 +4.5.105 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/examples/SystemInfo/.gitignore new/libstorage-ng-4.5.105/examples/SystemInfo/.gitignore --- old/libstorage-ng-4.5.103/examples/SystemInfo/.gitignore 2023-05-13 04:15:14.000000000 +0200 +++ new/libstorage-ng-4.5.105/examples/SystemInfo/.gitignore 2023-05-16 11:21:53.000000000 +0200 @@ -14,6 +14,8 @@ test-cmd-dumpe2fs test-cmd-lvs test-cmd-ntfsresize +test-cmd-nvme-list +test-cmd-nvme-list-subsys test-cmd-pvs test-cmd-resize2fs test-cmd-stat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/examples/SystemInfo/Makefile.am new/libstorage-ng-4.5.105/examples/SystemInfo/Makefile.am --- old/libstorage-ng-4.5.103/examples/SystemInfo/Makefile.am 2023-05-13 04:15:14.000000000 +0200 +++ new/libstorage-ng-4.5.105/examples/SystemInfo/Makefile.am 2023-05-16 11:21:53.000000000 +0200 @@ -7,10 +7,10 @@ LDADD = ../../storage/libstorage-ng.la noinst_PROGRAMS = test-blkid test-cmd-btrfs-filesystem-show \ - test-cmd-dmsetup-info test-cmd-dmsetup-table test-cmd-lvs test-cmd-pvs \ + test-cmd-dmsetup-info test-cmd-dmsetup-table test-cmd-lvs test-cmd-pvs \ test-cmd-vgs test-cmd-udevadm-info test-dasdview test-dir test-dmraid \ test-cmd-dumpe2fs test-cmd-resize2fs test-cmd-ntfsresize \ - test-lsattr test-lsscsi \ + test-lsattr test-lsscsi test-cmd-nvme-list test-cmd-nvme-list-subsys \ test-mdadm-detail test-mdlinks test-multipath \ test-parted test-cmd-stat test-cmd-blockdev \ test-proc-mdstat test-proc-mounts test-cmd-df \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/examples/SystemInfo/test-cmd-nvme-list-subsys.cc new/libstorage-ng-4.5.105/examples/SystemInfo/test-cmd-nvme-list-subsys.cc --- old/libstorage-ng-4.5.103/examples/SystemInfo/test-cmd-nvme-list-subsys.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.5.105/examples/SystemInfo/test-cmd-nvme-list-subsys.cc 2023-05-16 11:21:53.000000000 +0200 @@ -0,0 +1,34 @@ + +#include <iostream> + +#include <storage/SystemInfo/SystemInfoImpl.h> + +using namespace std; +using namespace storage; + + +void +test_nvme_list_subsys(SystemInfo::Impl& system_info) +{ + try + { + const CmdNvmeListSubsys& cmd_nvme_list_subsys = system_info.getCmdNvmeListSubsys(); + cout << "CmdNvmeListSubsys success" << endl; + cout << cmd_nvme_list_subsys << endl; + } + catch (const exception& e) + { + cerr << "CmdNvmeListSubsys failed" << endl; + } +} + + +int +main() +{ + set_logger(get_logfile_logger()); + + SystemInfo::Impl system_info; + + test_nvme_list_subsys(system_info); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/examples/SystemInfo/test-cmd-nvme-list.cc new/libstorage-ng-4.5.105/examples/SystemInfo/test-cmd-nvme-list.cc --- old/libstorage-ng-4.5.103/examples/SystemInfo/test-cmd-nvme-list.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.5.105/examples/SystemInfo/test-cmd-nvme-list.cc 2023-05-16 11:21:53.000000000 +0200 @@ -0,0 +1,34 @@ + +#include <iostream> + +#include <storage/SystemInfo/SystemInfoImpl.h> + +using namespace std; +using namespace storage; + + +void +test_nvme_list(SystemInfo::Impl& system_info) +{ + try + { + const CmdNvmeList& cmd_nvme_list = system_info.getCmdNvmeList(); + cout << "CmdNvmeList success" << endl; + cout << cmd_nvme_list << endl; + } + catch (const exception& e) + { + cerr << "CmdNvmeList failed" << endl; + } +} + + +int +main() +{ + set_logger(get_logfile_logger()); + + SystemInfo::Impl system_info; + + test_nvme_list(system_info); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/storage/Filesystems/BlkFilesystemImpl.cc new/libstorage-ng-4.5.105/storage/Filesystems/BlkFilesystemImpl.cc --- old/libstorage-ng-4.5.103/storage/Filesystems/BlkFilesystemImpl.cc 2023-05-13 04:15:14.000000000 +0200 +++ new/libstorage-ng-4.5.105/storage/Filesystems/BlkFilesystemImpl.cc 2023-05-16 11:21:53.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright (c) [2014-2015] Novell, Inc. - * Copyright (c) [2016-2022] SUSE LLC + * Copyright (c) [2016-2023] SUSE LLC * * All Rights Reserved. * @@ -62,8 +62,7 @@ BlkFilesystem::Impl::Impl(const xmlNode* node) - : Filesystem::Impl(node), label(), uuid(), mkfs_options(), tune_options(), resize_info(), - content_info() + : Filesystem::Impl(node) { getChildValue(node, "label", label); getChildValue(node, "uuid", uuid); @@ -753,20 +752,22 @@ MountPointPath mount_point_path(fstab_entry->get_mount_point(), true); ret.emplace_back(mount_point_path, fstab_entry); } - - for (const BlkDevice* blk_device : get_blk_devices()) + else { - if (blk_device->get_impl().spec_match(system_info, spec)) + for (const BlkDevice* blk_device : get_blk_devices()) { - // For tmpfs, proc the spec can be anything (including a valid block device). - if (fstab_entry->get_fs_type() == FsType::TMPFS) - continue; + if (blk_device->get_impl().spec_match(system_info, spec)) + { + // For tmpfs, proc the spec can be anything (including a valid block device). + if (fstab_entry->get_fs_type() == FsType::TMPFS) + continue; - const FilesystemUser* filesystem_user = - to_filesystem_user(get_devicegraph()->find_holder(blk_device->get_sid(), get_sid())); + const FilesystemUser* filesystem_user = + to_filesystem_user(get_devicegraph()->find_holder(blk_device->get_sid(), get_sid())); - MountPointPath mount_point_path(fstab_entry->get_mount_point(), true); - ret.emplace_back(mount_point_path, fstab_entry, filesystem_user->get_impl().get_id()); + MountPointPath mount_point_path(fstab_entry->get_mount_point(), true); + ret.emplace_back(mount_point_path, fstab_entry, filesystem_user->get_impl().get_id()); + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/storage/Filesystems/MountableImpl.cc new/libstorage-ng-4.5.105/storage/Filesystems/MountableImpl.cc --- old/libstorage-ng-4.5.103/storage/Filesystems/MountableImpl.cc 2023-05-13 04:15:14.000000000 +0200 +++ new/libstorage-ng-4.5.105/storage/Filesystems/MountableImpl.cc 2023-05-16 11:21:53.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright (c) [2014-2015] Novell, Inc. - * Copyright (c) [2016-2022] SUSE LLC + * Copyright (c) [2016-2023] SUSE LLC * * All Rights Reserved. * @@ -220,8 +220,13 @@ if (!joint_entries.empty()) { if (joint_entries.size() > 1) + { y2war("more than one mount point for " << (*this->get_non_impl())); + for (const JointEntry& tmp : joint_entries) + y2war(tmp.mount_point_path.fullpath(get_storage()->get_rootprefix())); + } + // Selecting the most reasonable mount point: // // * shortest active mount point from the fstab or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/storage/SystemInfo/CmdNvme.cc new/libstorage-ng-4.5.105/storage/SystemInfo/CmdNvme.cc --- old/libstorage-ng-4.5.103/storage/SystemInfo/CmdNvme.cc 2023-05-13 04:15:14.000000000 +0200 +++ new/libstorage-ng-4.5.105/storage/SystemInfo/CmdNvme.cc 2023-05-16 11:21:53.000000000 +0200 @@ -51,6 +51,13 @@ } + std::ostream& + operator<<(std::ostream& s, const CmdNvmeList& cmd_nvme_list) + { + return s; + } + + CmdNvmeListSubsys::CmdNvmeListSubsys() { SystemCmd cmd(NVME_BIN " list-subsys --verbose --output json", SystemCmd::DoThrow); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/storage/SystemInfo/CmdNvme.h new/libstorage-ng-4.5.105/storage/SystemInfo/CmdNvme.h --- old/libstorage-ng-4.5.103/storage/SystemInfo/CmdNvme.h 2023-05-13 04:15:14.000000000 +0200 +++ new/libstorage-ng-4.5.105/storage/SystemInfo/CmdNvme.h 2023-05-16 11:21:53.000000000 +0200 @@ -48,6 +48,8 @@ CmdNvmeList(); + friend std::ostream& operator<<(std::ostream& s, const CmdNvmeList& cmd_nvme_list); + private: void parse(const vector<string>& lines); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/testsuite/SystemInfo/nvme-list.cc new/libstorage-ng-4.5.105/testsuite/SystemInfo/nvme-list.cc --- old/libstorage-ng-4.5.103/testsuite/SystemInfo/nvme-list.cc 2023-05-13 04:15:14.000000000 +0200 +++ new/libstorage-ng-4.5.105/testsuite/SystemInfo/nvme-list.cc 2023-05-16 11:21:53.000000000 +0200 @@ -22,6 +22,16 @@ Mockup::set_command(NVME_BIN " list --verbose --output json", input); CmdNvmeList cmd_nvme_list; + + ostringstream parsed; + parsed.setf(std::ios::boolalpha); + parsed << cmd_nvme_list; + + string lhs = parsed.str(); + string rhs = accumulate(output.begin(), output.end(), ""s, + [](auto a, auto b) { return a + b + "\n"; }); + + BOOST_CHECK_EQUAL(lhs, rhs); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.103/testsuite/probe/multipath1-mockup.xml new/libstorage-ng-4.5.105/testsuite/probe/multipath1-mockup.xml --- old/libstorage-ng-4.5.103/testsuite/probe/multipath1-mockup.xml 2023-05-13 04:15:14.000000000 +0200 +++ new/libstorage-ng-4.5.105/testsuite/probe/multipath1-mockup.xml 2023-05-16 11:21:53.000000000 +0200 @@ -679,12 +679,12 @@ </Commands> <Files> <File> + <!-- looks broken since ccw-0.0.0150 is dasdb --> <name>/etc/fstab</name> <content>/dev/disk/by-path/ccw-0.0.0150-part2 swap swap defaults 0 0</content> <content>/dev/disk/by-path/ccw-0.0.0150-part3 / ext4 acl,user_xattr 1 1</content> <content>/dev/disk/by-path/ccw-0.0.0150-part1 /boot/zipl ext2 acl,user_xattr 1 2</content> <content></content> - <content></content> <content>/dev/dasdb2 /test2 ext4 defaults 0 0</content> <content>/dev/dasdb3 /test3 ext4 defaults 0 0</content> </File>