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-02-09 20:38:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Wed Feb 9 20:38:24 2022 rev:151 rq:952054 version:4.4.81
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes
2022-02-06 23:53:40.635062308 +0100
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.1898/libstorage-ng.changes
2022-02-09 20:38:44.290309685 +0100
@@ -1,0 +2,16 @@
+Mon Feb 7 08:57:48 UTC 2022 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#860
+- added integration test
+- use in-class member initialization
+- 4.4.81
+
+--------------------------------------------------------------------
+Mon Feb 7 07:36:45 UTC 2022 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#859
+- Modify mount point if mount_type changes
+- Mount/unmount if needed when mount type changes
+- 4.4.80
+
+--------------------------------------------------------------------
Old:
----
libstorage-ng-4.4.79.tar.xz
New:
----
libstorage-ng-4.4.81.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.i8OYTb/_old 2022-02-09 20:38:45.778313244 +0100
+++ /var/tmp/diff_new_pack.i8OYTb/_new 2022-02-09 20:38:45.782313253 +0100
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.4.79
+Version: 4.4.81
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
++++++ libstorage-ng-4.4.79.tar.xz -> libstorage-ng-4.4.81.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.79/VERSION
new/libstorage-ng-4.4.81/VERSION
--- old/libstorage-ng-4.4.79/VERSION 2022-02-03 13:12:18.000000000 +0100
+++ new/libstorage-ng-4.4.81/VERSION 2022-02-07 09:57:48.000000000 +0100
@@ -1 +1 @@
-4.4.79
+4.4.81
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.79/integration-tests/mount-points/set-mount-type.py
new/libstorage-ng-4.4.81/integration-tests/mount-points/set-mount-type.py
--- old/libstorage-ng-4.4.79/integration-tests/mount-points/set-mount-type.py
1970-01-01 01:00:00.000000000 +0100
+++ new/libstorage-ng-4.4.81/integration-tests/mount-points/set-mount-type.py
2022-02-07 09:57:48.000000000 +0100
@@ -0,0 +1,39 @@
+#!/usr/bin/python3
+
+# requirements: nfs or nfs4 mounted at /test
+
+
+from storage import *
+from storageitu import *
+
+
+set_logger(get_logfile_logger())
+
+environment = Environment(False)
+
+storage = Storage(environment)
+storage.probe()
+
+staging = storage.get_staging()
+
+print(staging)
+
+mount_points = MountPoint.find_by_path(staging, "/test")
+
+mount_point = mount_points[0]
+
+print(FsType_NFS, FsType_NFS4)
+
+print(mount_point.get_mount_type())
+
+if mount_point.get_mount_type() == FsType_NFS:
+ mount_point.set_mount_type(FsType_NFS4)
+else:
+ mount_point.set_mount_type(FsType_NFS)
+
+print(mount_point.get_mount_type())
+
+print(staging)
+
+commit(storage)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.79/storage/Filesystems/MountPointImpl.cc
new/libstorage-ng-4.4.81/storage/Filesystems/MountPointImpl.cc
--- old/libstorage-ng-4.4.79/storage/Filesystems/MountPointImpl.cc
2022-02-03 13:12:18.000000000 +0100
+++ new/libstorage-ng-4.4.81/storage/Filesystems/MountPointImpl.cc
2022-02-07 09:57:48.000000000 +0100
@@ -432,9 +432,9 @@
}
// A unmount action could be required when the device is set as
unmounted in the target system
- // or when its mount path has changed. But the unmount action only
makes sense if the device is
- // currently mounted in the system.
- if (lhs.active && (!active || lhs.path != path))
+ // or when some of its mount properties have changed (e.g., path, mount
type). But the unmount
+ // action only makes sense if the device is currently mounted in the
system.
+ if (lhs.active && (!active || lhs.path != path || lhs.mount_type !=
mount_type))
{
actions.push_back(make_shared<Action::Unmount>(get_sid()));
}
@@ -442,16 +442,17 @@
if (lhs.in_etc_fstab && in_etc_fstab)
{
if (lhs.mount_by != mount_by || lhs.mount_options != mount_options
||
- lhs.freq != freq || lhs.passno != passno || lhs.path != path)
+ lhs.freq != freq || lhs.passno != passno || lhs.path != path ||
+ lhs.mount_type != mount_type)
{
actions.push_back(make_shared<Action::UpdateInEtcFstab>(get_sid()));
}
}
// A mount action could be required when the device is currently
unmounted in the system or when
- // its mount path has changed. But the mount action only makes sense if
the device is set as
- // mounted in the target system.
- if (active && (!lhs.active || lhs.path != path))
+ // when some of its mount properties have changed (e.g., path, mount
type). But the mount action
+ // only makes sense if the device is set as mounted in the target
system.
+ if (active && (!lhs.active || lhs.path != path || lhs.mount_type !=
mount_type))
{
actions.push_back(make_shared<Action::Mount>(get_sid()));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.79/storage/Utils/JsonFile.cc
new/libstorage-ng-4.4.81/storage/Utils/JsonFile.cc
--- old/libstorage-ng-4.4.79/storage/Utils/JsonFile.cc 2022-02-03
13:12:18.000000000 +0100
+++ new/libstorage-ng-4.4.81/storage/Utils/JsonFile.cc 2022-02-07
09:57:48.000000000 +0100
@@ -33,7 +33,6 @@
{
JsonFile::JsonFile(const vector<string>& lines)
- : root(nullptr)
{
std::unique_ptr<json_tokener, std::function<void(json_tokener*)>>
tokener(
json_tokener_new(), [](json_tokener* p) { json_tokener_free(p); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.79/storage/Utils/JsonFile.h
new/libstorage-ng-4.4.81/storage/Utils/JsonFile.h
--- old/libstorage-ng-4.4.79/storage/Utils/JsonFile.h 2022-02-03
13:12:18.000000000 +0100
+++ new/libstorage-ng-4.4.81/storage/Utils/JsonFile.h 2022-02-07
09:57:48.000000000 +0100
@@ -48,7 +48,7 @@
private:
- json_object* root;
+ json_object* root = nullptr;
};
