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 2021-10-04 18:39:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng" Mon Oct 4 18:39:12 2021 rev:130 rq:922979 version:4.4.41 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2021-09-25 00:35:41.867148382 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.2443/libstorage-ng.changes 2021-10-04 18:40:16.978088517 +0200 @@ -1,0 +2,29 @@ +Mon Oct 4 10:37:30 UTC 2021 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#833 +- avoid sporadic out-of-memory during build (on Fedora) +- 4.4.41 + +-------------------------------------------------------------------- +Mon Oct 4 09:17:01 UTC 2021 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#832 +- added BlkDevice::can_be_removed() +- 4.4.40 + +-------------------------------------------------------------------- +Fri Oct 1 08:40:38 UTC 2021 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#831 +- added non-const Encryption::get_blk_device() +- 4.4.39 + +-------------------------------------------------------------------- +Thu Sep 30 11:56:13 UTC 2021 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#830 +- added get_encryption_type_name() +- coding style +- 4.4.38 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.4.37.tar.xz New: ---- libstorage-ng-4.4.41.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.WxrY9P/_old 2021-10-04 18:40:17.562089466 +0200 +++ /var/tmp/diff_new_pack.WxrY9P/_new 2021-10-04 18:40:17.566089473 +0200 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.4.37 +Version: 4.4.41 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.WxrY9P/_old 2021-10-04 18:40:17.598089525 +0200 +++ /var/tmp/diff_new_pack.WxrY9P/_new 2021-10-04 18:40:17.598089525 +0200 @@ -3,5 +3,8 @@ <disk> <size unit="G">4</size> </disk> + <memory> + <size unit="G">4</size> + </memory> </hardware> </constraints> ++++++ libstorage-ng-4.4.37.tar.xz -> libstorage-ng-4.4.41.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/LIBVERSION new/libstorage-ng-4.4.41/LIBVERSION --- old/libstorage-ng-4.4.37/LIBVERSION 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/LIBVERSION 2021-10-04 12:37:30.000000000 +0200 @@ -1 +1 @@ -1.61.0 +1.64.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/VERSION new/libstorage-ng-4.4.41/VERSION --- old/libstorage-ng-4.4.37/VERSION 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/VERSION 2021-10-04 12:37:30.000000000 +0200 @@ -1 +1 @@ -4.4.37 +4.4.41 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/bindings/storage-catches.i new/libstorage-ng-4.4.41/bindings/storage-catches.i --- old/libstorage-ng-4.4.37/bindings/storage-catches.i 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/bindings/storage-catches.i 2021-10-04 12:37:30.000000000 +0200 @@ -223,6 +223,7 @@ %catches(storage::LogicException, storage::Exception) storage::Bcache::remove_bcache_cset(); %catches(storage::DeviceNotFound, storage::DeviceHasWrongType) storage::BcacheCset::find_by_uuid(Devicegraph *devicegraph, const std::string &uuid); %catches(storage::DeviceNotFound, storage::DeviceHasWrongType) storage::BcacheCset::find_by_uuid(const Devicegraph *devicegraph, const std::string &uuid); +%catches(storage::Exception) storage::BlkDevice::can_be_removed() const; %catches(storage::WrongNumberOfChildren) storage::BlkDevice::create_bcache_cset(); %catches(storage::WrongNumberOfChildren, storage::UnsupportedException) storage::BlkDevice::create_blk_filesystem(FsType fs_type); %catches(storage::WrongNumberOfChildren, storage::UnsupportedException) storage::BlkDevice::create_filesystem(FsType fs_type); @@ -290,6 +291,8 @@ %catches(storage::DeviceNotFound, storage::DeviceHasWrongType) storage::Disk::find_by_name(const Devicegraph *devicegraph, const std::string &name); %catches(storage::DeviceNotFound, storage::DeviceHasWrongType) storage::DmRaid::find_by_name(Devicegraph *devicegraph, const std::string &name); %catches(storage::DeviceNotFound, storage::DeviceHasWrongType) storage::DmRaid::find_by_name(const Devicegraph *devicegraph, const std::string &name); +%catches(storage::Exception) storage::Encryption::get_blk_device(); +%catches(storage::Exception) storage::Encryption::get_blk_device() const; %catches(storage::Exception) storage::Filesystem::detect_space_info() const; %catches(storage::HolderAlreadyExists) storage::FilesystemUser::create(Devicegraph *devicegraph, const Device *source, const Device *target); %catches(storage::Exception) storage::Holder::copy_to_devicegraph(Devicegraph *devicegraph) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/obs/_constraints new/libstorage-ng-4.4.41/obs/_constraints --- old/libstorage-ng-4.4.37/obs/_constraints 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/obs/_constraints 2021-10-04 12:37:30.000000000 +0200 @@ -3,5 +3,8 @@ <disk> <size unit="G">4</size> </disk> + <memory> + <size unit="G">4</size> + </memory> </hardware> </constraints> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/CompoundAction/Formatter/Bcache.cc new/libstorage-ng-4.4.41/storage/CompoundAction/Formatter/Bcache.cc --- old/libstorage-ng-4.4.37/storage/CompoundAction/Formatter/Bcache.cc 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/CompoundAction/Formatter/Bcache.cc 2021-10-04 12:37:30.000000000 +0200 @@ -45,9 +45,9 @@ Text text = bcache_text(); Text cset_text = bcache_cset_text(); - if ( ! cset_text.translated.empty() ) + if (!cset_text.empty()) { - text += Text( "\n", "\n" ); + text += UntranslatedText("\n"); text += cset_text; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/BlkDevice.cc new/libstorage-ng-4.4.41/storage/Devices/BlkDevice.cc --- old/libstorage-ng-4.4.37/storage/Devices/BlkDevice.cc 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/BlkDevice.cc 2021-10-04 12:37:30.000000000 +0200 @@ -113,6 +113,13 @@ } + bool + BlkDevice::can_be_removed() const + { + return get_impl().can_be_removed(); + } + + void BlkDevice::set_name(const string& name) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/BlkDevice.h new/libstorage-ng-4.4.41/storage/Devices/BlkDevice.h --- old/libstorage-ng-4.4.37/storage/Devices/BlkDevice.h 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/BlkDevice.h 2021-10-04 12:37:30.000000000 +0200 @@ -138,6 +138,14 @@ bool is_usable_as_blk_device() const; /** + * Check whether the device can be removed. E.g. disks and DASDs cannot be + * removed. + * + * @throw Exception + */ + bool can_be_removed() const; + + /** * Return device-mapper table name (dm-table-name for short). Empty if * this is not a device-mapper device. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/BlkDeviceImpl.h new/libstorage-ng-4.4.41/storage/Devices/BlkDeviceImpl.h --- old/libstorage-ng-4.4.37/storage/Devices/BlkDeviceImpl.h 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/BlkDeviceImpl.h 2021-10-04 12:37:30.000000000 +0200 @@ -62,6 +62,8 @@ virtual bool is_usable_as_blk_device() const { return active; } + virtual bool can_be_removed() const { return true; } + const string& get_name() const { return name; } void set_name(const string& name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/DasdImpl.h new/libstorage-ng-4.4.41/storage/Devices/DasdImpl.h --- old/libstorage-ng-4.4.37/storage/Devices/DasdImpl.h 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/DasdImpl.h 2021-10-04 12:37:30.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright (c) [2014-2015] Novell, Inc. - * Copyright (c) [2016-2020] SUSE LLC + * Copyright (c) [2016-2021] SUSE LLC * * All Rights Reserved. * @@ -66,6 +66,8 @@ virtual void check(const CheckCallbacks* check_callbacks) const override; + virtual bool can_be_removed() const override { return false; } + string get_bus_id() const { return bus_id; } void set_bus_id(string bus_id) { Impl::bus_id = bus_id; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/DiskImpl.h new/libstorage-ng-4.4.41/storage/Devices/DiskImpl.h --- old/libstorage-ng-4.4.37/storage/Devices/DiskImpl.h 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/DiskImpl.h 2021-10-04 12:37:30.000000000 +0200 @@ -70,6 +70,8 @@ virtual ResizeInfo detect_resize_info(const BlkDevice* blk_device = nullptr) const override; + virtual bool can_be_removed() const override { return false; } + bool is_rotational() const { return rotational; } void set_rotational(bool rotational) { Impl::rotational = rotational; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/Encryption.cc new/libstorage-ng-4.4.41/storage/Devices/Encryption.cc --- old/libstorage-ng-4.4.37/storage/Devices/Encryption.cc 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/Encryption.cc 2021-10-04 12:37:30.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2016-2019] SUSE LLC + * Copyright (c) [2016-2021] SUSE LLC * * All Rights Reserved. * @@ -30,6 +30,13 @@ using namespace std; + string + get_encryption_type_name(EncryptionType encryption_type) + { + return toString(encryption_type); + } + + Encryption* Encryption::create(Devicegraph* devicegraph, const string& name) { @@ -194,6 +201,13 @@ } + BlkDevice* + Encryption::get_blk_device() + { + return get_impl().get_blk_device(); + } + + const BlkDevice* Encryption::get_blk_device() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/Encryption.h new/libstorage-ng-4.4.41/storage/Devices/Encryption.h --- old/libstorage-ng-4.4.37/storage/Devices/Encryption.h 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/Encryption.h 2021-10-04 12:37:30.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2016-2020] SUSE LLC + * Copyright (c) [2016-2021] SUSE LLC * * All Rights Reserved. * @@ -35,6 +35,14 @@ }; + /** + * Convert the EncryptionType encryption_type to a string. + * + * @see EncryptionType + */ + std::string get_encryption_type_name(EncryptionType encryption_type); + + // TODO depending on the encryption types supported the Encryption class // can be dropped or be abstract @@ -163,6 +171,13 @@ /** * Return underlying blk device. + * + * @throw Exception + */ + BlkDevice* get_blk_device(); + + /** + * @copydoc get_blk_device() */ const BlkDevice* get_blk_device() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/EncryptionImpl.cc new/libstorage-ng-4.4.41/storage/Devices/EncryptionImpl.cc --- old/libstorage-ng-4.4.37/storage/Devices/EncryptionImpl.cc 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/EncryptionImpl.cc 2021-10-04 12:37:30.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2016-2019] SUSE LLC + * Copyright (c) [2016-2021] SUSE LLC * * All Rights Reserved. * @@ -225,6 +225,15 @@ } + BlkDevice* + Encryption::Impl::get_blk_device() + { + Devicegraph::Impl::vertex_descriptor vertex = get_devicegraph()->get_impl().parent(get_vertex()); + + return to_blk_device(get_devicegraph()->get_impl()[vertex]); + } + + const BlkDevice* Encryption::Impl::get_blk_device() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/EncryptionImpl.h new/libstorage-ng-4.4.41/storage/Devices/EncryptionImpl.h --- old/libstorage-ng-4.4.37/storage/Devices/EncryptionImpl.h 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/EncryptionImpl.h 2021-10-04 12:37:30.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2016-2019] SUSE LLC + * Copyright (c) [2016-2021] SUSE LLC * * All Rights Reserved. * @@ -104,6 +104,7 @@ const string& get_crypttab_blk_device_name() const { return crypttab_blk_device_name; } void set_crypttab_blk_device_name(const string& name) { Impl::crypttab_blk_device_name = name; } + BlkDevice* get_blk_device(); const BlkDevice* get_blk_device() const; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/MultipathImpl.h new/libstorage-ng-4.4.41/storage/Devices/MultipathImpl.h --- old/libstorage-ng-4.4.37/storage/Devices/MultipathImpl.h 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/MultipathImpl.h 2021-10-04 12:37:30.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2017-2019] SUSE LLC + * Copyright (c) [2017-2021] SUSE LLC * * All Rights Reserved. * @@ -65,6 +65,8 @@ virtual void check(const CheckCallbacks* check_callbacks) const override; + virtual bool can_be_removed() const override { return false; } + static bool is_valid_name(const string& name); const string& get_vendor() const { return vendor; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Devices/StrayBlkDeviceImpl.h new/libstorage-ng-4.4.41/storage/Devices/StrayBlkDeviceImpl.h --- old/libstorage-ng-4.4.37/storage/Devices/StrayBlkDeviceImpl.h 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Devices/StrayBlkDeviceImpl.h 2021-10-04 12:37:30.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2018-2019] SUSE LLC + * Copyright (c) [2018-2021] SUSE LLC * * All Rights Reserved. * @@ -61,6 +61,8 @@ virtual ResizeInfo detect_resize_info(const BlkDevice* blk_device = nullptr) const override; + virtual bool can_be_removed() const override { return false; } + static void probe_stray_blk_devices(Prober& prober); virtual void probe_pass_1a(Prober& prober) override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Filesystems/BlkFilesystemImpl.cc new/libstorage-ng-4.4.41/storage/Filesystems/BlkFilesystemImpl.cc --- old/libstorage-ng-4.4.37/storage/Filesystems/BlkFilesystemImpl.cc 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Filesystems/BlkFilesystemImpl.cc 2021-10-04 12:37:30.000000000 +0200 @@ -434,12 +434,12 @@ const char* files[] = { "boot.ini", "msdos.sys", "io.sys", "config.sys", "MSDOS.SYS", "IO.SYS", "bootmgr", "$Boot" }; - for (unsigned int i = 0; i < lengthof(files); ++i) + for (const char* file : files) { - string file = mount_point + "/" + files[i]; - if (access(file.c_str(), R_OK) == 0) + string tmp = mount_point + "/" + file; + if (access(tmp.c_str(), R_OK) == 0) { - y2mil("found windows file " << quote(file)); + y2mil("found windows file " << quote(tmp)); return true; } } @@ -468,12 +468,12 @@ { if (!boost::ends_with(dir, "/root") && checkDir(dir)) { - for (unsigned int i = 0; i < lengthof(files); ++i) + for (const char* file : files) { - string file = dir + "/" + files[i]; - if (access(file.c_str(), R_OK) == 0) + string tmp = dir + "/" + file; + if (access(tmp.c_str(), R_OK) == 0) { - y2mil("found home file " << quote(file)); + y2mil("found home file " << quote(tmp)); ++num_homes; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Utils/StorageTmpl.h new/libstorage-ng-4.4.41/storage/Utils/StorageTmpl.h --- old/libstorage-ng-4.4.37/storage/Utils/StorageTmpl.h 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Utils/StorageTmpl.h 2021-10-04 12:37:30.000000000 +0200 @@ -262,10 +262,6 @@ return output; } - - template <class T, unsigned int sz> - inline unsigned int lengthof(T (&)[sz]) { return sz; } - } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.37/storage/Utils/Text.h new/libstorage-ng-4.4.41/storage/Utils/Text.h --- old/libstorage-ng-4.4.37/storage/Utils/Text.h 2021-09-21 11:12:01.000000000 +0200 +++ new/libstorage-ng-4.4.41/storage/Utils/Text.h 2021-10-04 12:37:30.000000000 +0200 @@ -59,11 +59,14 @@ /** - * Untranslated version of class Text. Useful for fatal logical error - * messages that need no translation but where a Text object is required. + * Untranslated version of class Text. Useful for fatal logical error messages that + * need no translation but where a Text object is required or for adding spaces and + * newlines. */ - struct UntranslatedText : public Text + class UntranslatedText : public Text { + public: + UntranslatedText(const char* native) : Text(native, native) {} UntranslatedText(const string& native) : Text(native, native) {} };