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 2025-01-12 11:10:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng" Sun Jan 12 11:10:09 2025 rev:282 rq:1236127 version:4.5.222 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2024-12-19 21:40:32.404456333 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.1881/libstorage-ng.changes 2025-01-12 11:10:35.253623198 +0100 @@ -1,0 +2,7 @@ +Thu Jan 9 09:26:48 UTC 2025 - [email protected] + +- merge gh#openSUSE/libstorage-ng#1004 +- allow to disable blkdiscard calls +- 4.5.222 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.5.221.tar.xz New: ---- libstorage-ng-4.5.222.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.fGLTTA/_old 2025-01-12 11:10:36.165660729 +0100 +++ /var/tmp/diff_new_pack.fGLTTA/_new 2025-01-12 11:10:36.169660893 +0100 @@ -1,7 +1,7 @@ # # spec file for package libstorage-ng # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.5.221 +Version: 4.5.222 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ libstorage-ng-4.5.221.tar.xz -> libstorage-ng-4.5.222.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.221/VERSION new/libstorage-ng-4.5.222/VERSION --- old/libstorage-ng-4.5.221/VERSION 2024-12-19 10:53:24.000000000 +0100 +++ new/libstorage-ng-4.5.222/VERSION 2025-01-09 10:26:48.000000000 +0100 @@ -1 +1 @@ -4.5.221 +4.5.222 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.221/storage/Devices/BlkDeviceImpl.cc new/libstorage-ng-4.5.222/storage/Devices/BlkDeviceImpl.cc --- old/libstorage-ng-4.5.221/storage/Devices/BlkDeviceImpl.cc 2024-12-19 10:53:24.000000000 +0100 +++ new/libstorage-ng-4.5.222/storage/Devices/BlkDeviceImpl.cc 2025-01-09 10:26:48.000000000 +0100 @@ -1,6 +1,6 @@ /* * Copyright (c) [2014-2015] Novell, Inc. - * Copyright (c) [2016-2023] SUSE LLC + * Copyright (c) [2016-2025] SUSE LLC * * All Rights Reserved. * @@ -40,6 +40,7 @@ #include "storage/SystemInfo/SystemInfoImpl.h" #include "storage/FreeInfo.h" #include "storage/Prober.h" +#include "storage/EnvironmentImpl.h" #include "storage/Utils/Format.h" #include "storage/Registries.h" #include "storage/Actions/ActivateImpl.h" @@ -942,6 +943,9 @@ void BlkDevice::Impl::discard_device() const { + if (!run_blkdiscard()) + return; + wait_for_devices({ get_non_impl() }); SystemCmd::Args cmd_args = { BLKDISCARD_BIN, "--verbose", get_name() }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.221/storage/EnvironmentImpl.cc new/libstorage-ng-4.5.222/storage/EnvironmentImpl.cc --- old/libstorage-ng-4.5.221/storage/EnvironmentImpl.cc 2024-12-19 10:53:24.000000000 +0100 +++ new/libstorage-ng-4.5.222/storage/EnvironmentImpl.cc 2025-01-09 10:26:48.000000000 +0100 @@ -1,6 +1,6 @@ /* * Copyright (c) [2014-2015] Novell, Inc. - * Copyright (c) [2018-2024] SUSE LLC + * Copyright (c) [2018-2025] SUSE LLC * * All Rights Reserved. * @@ -167,6 +167,13 @@ } + bool + run_blkdiscard() + { + return read_env_var("LIBSTORAGE_BLKDISCARD", true); + } + + const vector<string> EnumTraits<OsFlavour>::names({ "linux", "suse", "redhat" }); @@ -206,6 +213,7 @@ "LC_ALL", "LC_CTYPE", "LC_MESSAGES" "LD_LIBRARY_PATH", "LD_PRELOAD", + "LIBSTORAGE_BLKDISCARD", "LIBSTORAGE_BTRFS_QGROUPS", "LIBSTORAGE_BTRFS_SNAPSHOT_RELATIONS", "LIBSTORAGE_CONFDIR", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.221/storage/EnvironmentImpl.h new/libstorage-ng-4.5.222/storage/EnvironmentImpl.h --- old/libstorage-ng-4.5.221/storage/EnvironmentImpl.h 2024-12-19 10:53:24.000000000 +0100 +++ new/libstorage-ng-4.5.222/storage/EnvironmentImpl.h 2025-01-09 10:26:48.000000000 +0100 @@ -1,6 +1,6 @@ /* * Copyright (c) [2014-2015] Novell, Inc. - * Copyright (c) [2018-2023] SUSE LLC + * Copyright (c) [2018-2025] SUSE LLC * * All Rights Reserved. * @@ -132,6 +132,11 @@ int topological_sort_method(); /** + * Switch to enable blkdiscard calls. + */ + bool run_blkdiscard(); + + /** * Operating system flavour. */ enum class OsFlavour
