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-03-25 18:55:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Sat Mar 25 18:55:01 2023 rev:209 rq:1074113 version:4.5.87
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes
2023-03-19 16:16:36.959333057 +0100
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.31432/libstorage-ng.changes
2023-03-25 18:55:10.218605572 +0100
@@ -1,0 +2,8 @@
+Fri Mar 24 08:23:55 UTC 2023 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#920
+- propagate failure of snapper installation-helper (bsc#1089823)
+- cleanup
+- 4.5.87
+
+--------------------------------------------------------------------
Old:
----
libstorage-ng-4.5.86.tar.xz
New:
----
libstorage-ng-4.5.87.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.yJZI3I/_old 2023-03-25 18:55:10.838608813 +0100
+++ /var/tmp/diff_new_pack.yJZI3I/_new 2023-03-25 18:55:10.842608833 +0100
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.5.86
+Version: 4.5.87
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
++++++ libstorage-ng-4.5.86.tar.xz -> libstorage-ng-4.5.87.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.86/LIBVERSION
new/libstorage-ng-4.5.87/LIBVERSION
--- old/libstorage-ng-4.5.86/LIBVERSION 2023-03-17 15:25:10.000000000 +0100
+++ new/libstorage-ng-4.5.87/LIBVERSION 2023-03-24 09:23:55.000000000 +0100
@@ -1 +1 @@
-1.84.1
+1.84.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.86/VERSION
new/libstorage-ng-4.5.87/VERSION
--- old/libstorage-ng-4.5.86/VERSION 2023-03-17 15:25:10.000000000 +0100
+++ new/libstorage-ng-4.5.87/VERSION 2023-03-24 09:23:55.000000000 +0100
@@ -1 +1 @@
-4.5.86
+4.5.87
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.86/storage/Utils/SnapperConfig.cc
new/libstorage-ng-4.5.87/storage/Utils/SnapperConfig.cc
--- old/libstorage-ng-4.5.86/storage/Utils/SnapperConfig.cc 2023-03-17
15:25:10.000000000 +0100
+++ new/libstorage-ng-4.5.87/storage/Utils/SnapperConfig.cc 2023-03-24
09:23:55.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) [2017-2018] SUSE LLC
+ * Copyright (c) [2017-2023] SUSE LLC
*
* All Rights Reserved.
*
@@ -23,10 +23,8 @@
#include <boost/algorithm/string.hpp>
#include "storage/Utils/SnapperConfig.h"
-
#include "storage/Devices/BlkDevice.h"
#include "storage/Devices/DeviceImpl.h"
-#include "storage/Filesystems/Btrfs.h"
#include "storage/Filesystems/BtrfsImpl.h"
#include "storage/Filesystems/BtrfsSubvolume.h"
#include "storage/Filesystems/MountPoint.h"
@@ -35,7 +33,6 @@
#include "storage/Utils/ExceptionImpl.h"
#include "storage/Utils/LoggerImpl.h"
#include "storage/Utils/SystemCmd.h"
-#include "storage/Utils/Text.h"
#define INSTALLATION_HELPER_BIN "/usr/lib/snapper/installation-helper"
#define SNAPSHOTS_DIR ".snapshots"
@@ -52,7 +49,7 @@
void
-SnapperConfig::pre_mount()
+SnapperConfig::pre_mount() const
{
if ( ! sanity_check() )
return;
@@ -72,7 +69,7 @@
void
-SnapperConfig::post_mount()
+SnapperConfig::post_mount() const
{
if ( ! sanity_check() )
return;
@@ -89,7 +86,7 @@
void
-SnapperConfig::post_add_to_etc_fstab( EtcFstab & etc_fstab )
+SnapperConfig::post_add_to_etc_fstab(EtcFstab& etc_fstab) const
{
if ( ! sanity_check() )
return;
@@ -123,29 +120,15 @@
}
-bool
-SnapperConfig::installation_helper( const vector<string> & args )
+void
+SnapperConfig::installation_helper(const vector<string>& args) const
{
- command_line = build_command_line( INSTALLATION_HELPER_BIN, args );
-
- if ( do_exec )
- {
- SystemCmd cmd( command_line, SystemCmd::NoThrow );
-
- return cmd.retcode() == 0;
- }
- else
- {
- y2mil( "NOT executing command: " << command_line );
-
- return true;
- }
+ SystemCmd cmd(build_command_line(INSTALLATION_HELPER_BIN, args),
SystemCmd::DoThrow);
}
string
-SnapperConfig::build_command_line( const string & command,
- const vector<string> & args ) const
+SnapperConfig::build_command_line(const string& command, const vector<string>&
args) const
{
string command_line = command;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.5.86/storage/Utils/SnapperConfig.h
new/libstorage-ng-4.5.87/storage/Utils/SnapperConfig.h
--- old/libstorage-ng-4.5.86/storage/Utils/SnapperConfig.h 2023-03-17
15:25:10.000000000 +0100
+++ new/libstorage-ng-4.5.87/storage/Utils/SnapperConfig.h 2023-03-24
09:23:55.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017 SUSE LLC
+ * Copyright (c) [2017-2023] SUSE LLC
*
* All Rights Reserved.
*
@@ -62,14 +62,14 @@
* configuration file for the root filesystem. Then create a first
* single snapshot and set this to the default snapshot.
**/
- void pre_mount();
+ void pre_mount() const;
/**
* Hook to be called after the Btrfs root filesystem is mounted.
* This executes installation-helper step 2:
* Mount the @/.snapshots or .snapshots subvolume.
**/
- void post_mount();
+ void post_mount() const;
/**
* Hook to be called after the Btrfs root filesystem is added to
@@ -77,45 +77,21 @@
*
* This adds @/.snapshots or .snapshots to /etc/fstab.
**/
- void post_add_to_etc_fstab( EtcFstab & etc_fstab );
+ void post_add_to_etc_fstab(EtcFstab& etc_fstab) const;
- /**
- * Return the Btrfs filesystem this object works on.
- **/
- const Btrfs* get_btrfs() const { return btrfs; }
-
- /**
- * Enable or disable actually executing the external commands. By
- * default, they are enabled. Disable this for test suites and check
- * what command would have been executed with get_last_command_line().
- **/
- void set_do_exec( bool exec ) { do_exec = exec; }
-
- /**
- * Return the current value of enabling or disabling executing external
- * commands.
- **/
- bool get_do_exec() const { return do_exec; }
-
- /**
- * Return the last executed command line.
- **/
- const string & get_last_command_line() const { return command_line; }
-
- protected:
+ private:
/**
* Call the external installation-helper program with arguments.
- * Return true if success, false if error.
+ * Throws in case of errors.
**/
- bool installation_helper( const vector<string> & args );
+ void installation_helper(const vector<string>& args) const;
/**
* Build a command line from a command and its arguments.
* Wrap all arguments that don't start with '--' in single quotes.
**/
- string build_command_line( const string & command,
- const vector<string> & args ) const;
+ string build_command_line(const string& command, const vector<string>&
args) const;
/**
* Check if snapper can and should be configured for this btrfs.
@@ -154,11 +130,9 @@
private:
const Btrfs* btrfs = nullptr;
- bool do_exec = true;
- string command_line;
};
}
-#endif // STORAGE_SNAPPER_CONFIG_H
+#endif
