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-12-18 20:29:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Sat Dec 18 20:29:24 2021 rev:141 rq:941206 version:4.4.66
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes
2021-12-08 22:08:24.630847228 +0100
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.2520/libstorage-ng.changes
2021-12-18 20:29:31.470218502 +0100
@@ -1,0 +2,8 @@
+Fri Dec 17 11:13:30 UTC 2021 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#849
+- added get_size function to LuksInfo
+- coding style
+- 4.4.66
+
+--------------------------------------------------------------------
Old:
----
libstorage-ng-4.4.65.tar.xz
New:
----
libstorage-ng-4.4.66.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.FWuoLo/_old 2021-12-18 20:29:31.986218788 +0100
+++ /var/tmp/diff_new_pack.FWuoLo/_new 2021-12-18 20:29:31.990218791 +0100
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.4.65
+Version: 4.4.66
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
++++++ libstorage-ng-4.4.65.tar.xz -> libstorage-ng-4.4.66.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/LIBVERSION
new/libstorage-ng-4.4.66/LIBVERSION
--- old/libstorage-ng-4.4.65/LIBVERSION 2021-12-04 02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/LIBVERSION 2021-12-17 12:13:30.000000000 +0100
@@ -1 +1 @@
-1.69.1
+1.70.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/VERSION
new/libstorage-ng-4.4.66/VERSION
--- old/libstorage-ng-4.4.65/VERSION 2021-12-04 02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/VERSION 2021-12-17 12:13:30.000000000 +0100
@@ -1 +1 @@
-4.4.65
+4.4.66
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/examples/SystemInfo/.gitignore
new/libstorage-ng-4.4.66/examples/SystemInfo/.gitignore
--- old/libstorage-ng-4.4.65/examples/SystemInfo/.gitignore 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/examples/SystemInfo/.gitignore 2021-12-17
12:13:30.000000000 +0100
@@ -1,5 +1,6 @@
*.o
test-blkid
+test-cmd-blockdev
test-cmd-btrfs-filesystem-df
test-cmd-btrfs-filesystem-show
test-cmd-btrfs-qgroup-show
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/examples/SystemInfo/Makefile.am
new/libstorage-ng-4.4.66/examples/SystemInfo/Makefile.am
--- old/libstorage-ng-4.4.65/examples/SystemInfo/Makefile.am 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/examples/SystemInfo/Makefile.am 2021-12-17
12:13:30.000000000 +0100
@@ -12,7 +12,7 @@
test-cmd-dumpe2fs test-cmd-resize2fs test-cmd-ntfsresize
\
test-lsattr test-lsscsi
\
test-mdadm-detail test-mdadm-examine test-mdlinks test-multipath
\
- test-parted test-cmd-stat
\
+ test-parted test-cmd-stat test-cmd-blockdev
\
test-proc-mdstat test-proc-mounts test-cmd-df
\
test-cmd-btrfs-subvolume-list test-cmd-btrfs-subvolume-get-default
\
test-cmd-btrfs-filesystem-df test-cmd-btrfs-qgroup-show
\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.65/examples/SystemInfo/test-cmd-blockdev.cc
new/libstorage-ng-4.4.66/examples/SystemInfo/test-cmd-blockdev.cc
--- old/libstorage-ng-4.4.65/examples/SystemInfo/test-cmd-blockdev.cc
1970-01-01 01:00:00.000000000 +0100
+++ new/libstorage-ng-4.4.66/examples/SystemInfo/test-cmd-blockdev.cc
2021-12-17 12:13:30.000000000 +0100
@@ -0,0 +1,35 @@
+
+#include <iostream>
+
+#include <storage/SystemInfo/SystemInfoImpl.h>
+
+using namespace std;
+using namespace storage;
+
+
+void
+test_blockdev(SystemInfo::Impl& system_info, const string& path)
+{
+ try
+ {
+ const CmdBlockdev& cmd_blockdev = system_info.getCmdBlockdev(path);
+ cout << "CmdBlockdev success for '" << path << "'" << endl;
+ cout << cmd_blockdev << endl;
+ cout << "get_size:" << cmd_blockdev.get_size() << endl;
+ }
+ catch (const exception& e)
+ {
+ cerr << "CmdBlockdev failed for '" << path << "'" << endl;
+ }
+}
+
+
+int
+main()
+{
+ set_logger(get_logfile_logger());
+
+ SystemInfo::Impl system_info;
+
+ test_blockdev(system_info, "/dev/sda");
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.65/integration-tests/misc/activate.py
new/libstorage-ng-4.4.66/integration-tests/misc/activate.py
--- old/libstorage-ng-4.4.65/integration-tests/misc/activate.py 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/integration-tests/misc/activate.py 2021-12-17
12:13:30.000000000 +0100
@@ -10,7 +10,7 @@
set_logger(get_logfile_logger())
-class MyActivateCallbacks(ActivateCallbacks):
+class MyActivateCallbacks(ActivateCallbacksLuks):
def __init__(self):
super(MyActivateCallbacks, self).__init__()
@@ -19,8 +19,9 @@
print("multipath callback")
return looks_like_real_multipath
- def luks(self, uuid, attempt):
- print("luks callback uuid:%s attempt:%d" % (uuid, attempt))
+ def luks(self, luks_info, attempt):
+ print("luks callback name:%s size:%u label:%s uuid:%s attempt:%d" %
(luks_info.get_device_name(),
+ luks_info.get_size(), luks_info.get_label(), luks_info.get_uuid(),
attempt))
if attempt == 2:
return PairBoolString(True, "12345678")
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/storage/Devices/LuksImpl.cc
new/libstorage-ng-4.4.66/storage/Devices/LuksImpl.cc
--- old/libstorage-ng-4.4.65/storage/Devices/LuksImpl.cc 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/storage/Devices/LuksImpl.cc 2021-12-17
12:13:30.000000000 +0100
@@ -172,6 +172,7 @@
LuksInfo info;
info.get_impl().device_name = name;
+ info.get_impl().size =
system_info.getCmdBlockdev(name).get_size();
info.get_impl().uuid = uuid;
info.get_impl().label = label;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/storage/Storage.cc
new/libstorage-ng-4.4.66/storage/Storage.cc
--- old/libstorage-ng-4.4.65/storage/Storage.cc 2021-12-04 02:18:23.000000000
+0100
+++ new/libstorage-ng-4.4.66/storage/Storage.cc 2021-12-17 12:13:30.000000000
+0100
@@ -49,6 +49,13 @@
}
+ unsigned long long
+ LuksInfo::get_size() const
+ {
+ return get_impl().size;
+ }
+
+
const string&
LuksInfo::get_uuid() const
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/storage/Storage.h
new/libstorage-ng-4.4.66/storage/Storage.h
--- old/libstorage-ng-4.4.65/storage/Storage.h 2021-12-04 02:18:23.000000000
+0100
+++ new/libstorage-ng-4.4.66/storage/Storage.h 2021-12-17 12:13:30.000000000
+0100
@@ -127,13 +127,11 @@
public:
LuksInfo();
-
~LuksInfo();
const std::string& get_device_name() const;
-
+ unsigned long long get_size() const;
const std::string& get_uuid() const;
-
const std::string& get_label() const;
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/storage/StorageImpl.h
new/libstorage-ng-4.4.66/storage/StorageImpl.h
--- old/libstorage-ng-4.4.65/storage/StorageImpl.h 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/storage/StorageImpl.h 2021-12-17
12:13:30.000000000 +0100
@@ -45,9 +45,8 @@
{
public:
- Impl() : device_name(), uuid(), label() {}
-
string device_name;
+ unsigned long long size = 0;
string uuid;
string label;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.65/storage/SystemInfo/CmdBlockdev.cc
new/libstorage-ng-4.4.66/storage/SystemInfo/CmdBlockdev.cc
--- old/libstorage-ng-4.4.65/storage/SystemInfo/CmdBlockdev.cc 1970-01-01
01:00:00.000000000 +0100
+++ new/libstorage-ng-4.4.66/storage/SystemInfo/CmdBlockdev.cc 2021-12-17
12:13:30.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2021 SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may
+ * find current contact information at www.novell.com.
+ */
+
+
+#include "storage/Utils/LoggerImpl.h"
+#include "storage/Utils/SystemCmd.h"
+#include "storage/Utils/StorageDefines.h"
+#include "storage/SystemInfo/CmdBlockdev.h"
+
+
+namespace storage
+{
+ using namespace std;
+
+
+ CmdBlockdev::CmdBlockdev(const string& path)
+ : path(path)
+ {
+ SystemCmd cmd(BLOCKDEV_BIN " --getsize64 " + quote(path));
+
+ if (cmd.retcode() == 0 && cmd.stdout().size() >= 1)
+ parse(cmd.stdout());
+
+ y2mil(*this);
+ }
+
+
+ void
+ CmdBlockdev::parse(const vector<string>& lines)
+ {
+ size = stoull(lines[0]);
+ }
+
+
+ std::ostream&
+ operator<<(std::ostream& s, const CmdBlockdev& cmd_blockdev)
+ {
+ s << "path:" << cmd_blockdev.path << " size:" << cmd_blockdev.size <<
'\n';
+
+ return s;
+ }
+
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.65/storage/SystemInfo/CmdBlockdev.h
new/libstorage-ng-4.4.66/storage/SystemInfo/CmdBlockdev.h
--- old/libstorage-ng-4.4.65/storage/SystemInfo/CmdBlockdev.h 1970-01-01
01:00:00.000000000 +0100
+++ new/libstorage-ng-4.4.66/storage/SystemInfo/CmdBlockdev.h 2021-12-17
12:13:30.000000000 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2021 SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may
+ * find current contact information at www.novell.com.
+ */
+
+
+#ifndef STORAGE_CMD_BLOCKDEV_H
+#define STORAGE_CMD_BLOCKDEV_H
+
+
+#include <string>
+#include <vector>
+
+
+namespace storage
+{
+ using std::string;
+ using std::vector;
+
+
+ class CmdBlockdev
+ {
+ public:
+
+ CmdBlockdev(const string& path);
+
+ unsigned long long get_size() const { return size; }
+
+ friend std::ostream& operator<<(std::ostream& s, const CmdBlockdev&
cmd_blockdev);
+
+ private:
+
+ void parse(const vector<string>& lines);
+
+ string path;
+
+ unsigned long long size = 0;
+
+ };
+
+}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/storage/SystemInfo/CmdParted.cc
new/libstorage-ng-4.4.66/storage/SystemInfo/CmdParted.cc
--- old/libstorage-ng-4.4.65/storage/SystemInfo/CmdParted.cc 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/storage/SystemInfo/CmdParted.cc 2021-12-17
12:13:30.000000000 +0100
@@ -68,7 +68,7 @@
//
// See also bsc#938572, bsc#938561
- for ( const string& line: stderr )
+ for (const string& line : stderr)
{
y2war( "parted stderr> " + line );
}
@@ -403,17 +403,17 @@
const map<unsigned int, const char*> Parted::id_to_name = {
- { ID_BIOS_BOOT, "bios_grub"},
- { ID_DIAG, "diag"},
- { ID_ESP, "esp"},
- { ID_IRST, "irst"},
+ { ID_BIOS_BOOT, "bios_grub" },
+ { ID_DIAG, "diag" },
+ { ID_ESP, "esp" },
+ { ID_IRST, "irst" },
{ ID_LINUX_HOME, "linux-home" },
- { ID_LVM, "lvm"},
- { ID_MICROSOFT_RESERVED, "msftres"},
- { ID_PREP, "prep"},
+ { ID_LVM, "lvm" },
+ { ID_MICROSOFT_RESERVED, "msftres" },
+ { ID_PREP, "prep" },
{ ID_RAID, "raid" },
- { ID_SWAP, "swap"},
- { ID_WINDOWS_BASIC_DATA, "msftdata"},
+ { ID_SWAP, "swap" },
+ { ID_WINDOWS_BASIC_DATA, "msftdata" },
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/storage/SystemInfo/CmdStat.cc
new/libstorage-ng-4.4.66/storage/SystemInfo/CmdStat.cc
--- old/libstorage-ng-4.4.65/storage/SystemInfo/CmdStat.cc 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/storage/SystemInfo/CmdStat.cc 2021-12-17
12:13:30.000000000 +0100
@@ -20,11 +20,8 @@
*/
-#include <boost/algorithm/string.hpp>
-
#include "storage/Utils/LoggerImpl.h"
#include "storage/Utils/SystemCmd.h"
-#include "storage/Utils/Mockup.h"
#include "storage/Utils/StorageDefines.h"
#include "storage/SystemInfo/CmdStat.h"
@@ -35,7 +32,7 @@
CmdStat::CmdStat(const string& path)
- : path(path), mode(0)
+ : path(path)
{
SystemCmd cmd(STAT_BIN " --format '%f' " + quote(path));
@@ -49,7 +46,7 @@
void
CmdStat::parse(const vector<string>& lines)
{
- mode = stoi(lines[0], 0, 16);
+ mode = stoi(lines[0], nullptr, 16);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/storage/SystemInfo/CmdStat.h
new/libstorage-ng-4.4.66/storage/SystemInfo/CmdStat.h
--- old/libstorage-ng-4.4.65/storage/SystemInfo/CmdStat.h 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/storage/SystemInfo/CmdStat.h 2021-12-17
12:13:30.000000000 +0100
@@ -57,7 +57,7 @@
string path;
- mode_t mode;
+ mode_t mode = 0;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/storage/SystemInfo/Makefile.am
new/libstorage-ng-4.4.66/storage/SystemInfo/Makefile.am
--- old/libstorage-ng-4.4.65/storage/SystemInfo/Makefile.am 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/storage/SystemInfo/Makefile.am 2021-12-17
12:13:30.000000000 +0100
@@ -24,6 +24,7 @@
CmdParted.cc CmdParted.h \
CmdResize2fs.cc CmdResize2fs.h \
CmdStat.cc CmdStat.h \
+ CmdBlockdev.cc CmdBlockdev.h \
CmdUdevadm.cc CmdUdevadm.h \
DevAndSys.cc DevAndSys.h \
ProcMdstat.cc ProcMdstat.h \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.65/storage/SystemInfo/SystemInfoImpl.h
new/libstorage-ng-4.4.66/storage/SystemInfo/SystemInfoImpl.h
--- old/libstorage-ng-4.4.65/storage/SystemInfo/SystemInfoImpl.h
2021-12-04 02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/storage/SystemInfo/SystemInfoImpl.h
2021-12-17 12:13:30.000000000 +0100
@@ -1,6 +1,6 @@
/*
* Copyright (c) [2004-2015] Novell, Inc.
- * Copyright (c) [2016-2020] SUSE LLC
+ * Copyright (c) [2016-2021] SUSE LLC
*
* All Rights Reserved.
*
@@ -38,6 +38,7 @@
#include "storage/SystemInfo/CmdLsscsi.h"
#include "storage/SystemInfo/CmdParted.h"
#include "storage/SystemInfo/CmdStat.h"
+#include "storage/SystemInfo/CmdBlockdev.h"
#include "storage/SystemInfo/CmdDasdview.h"
#include "storage/SystemInfo/CmdDf.h"
#include "storage/SystemInfo/CmdDmsetup.h"
@@ -84,6 +85,7 @@
const Dir& getDir(const string& path) { return dirs.get(path); }
const File& getFile(const string& path) { return files.get(path); }
const CmdStat& getCmdStat(const string& path) { return
cmd_stats.get(path); }
+ const CmdBlockdev& getCmdBlockdev(const string& path) { return
cmd_blockdev.get(path); }
const MdLinks& getMdLinks() { return md_links.get(); }
const ProcMounts& getProcMounts() { return proc_mounts.get(); }
const ProcMdstat& getProcMdstat() { return proc_mdstat.get(); }
@@ -237,6 +239,7 @@
LazyObjects<Dir> dirs;
LazyObjects<File> files;
LazyObjects<CmdStat> cmd_stats;
+ LazyObjects<CmdBlockdev> cmd_blockdev;
LazyObject<MdLinks> md_links;
LazyObject<ProcMounts> proc_mounts;
LazyObject<ProcMdstat> proc_mdstat;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/storage/Utils/StorageDefines.h
new/libstorage-ng-4.4.66/storage/Utils/StorageDefines.h
--- old/libstorage-ng-4.4.65/storage/Utils/StorageDefines.h 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/storage/Utils/StorageDefines.h 2021-12-17
12:13:30.000000000 +0100
@@ -106,6 +106,7 @@
#define DF_BIN "/usr/bin/df"
#define TEST_BIN "/usr/bin/test"
#define STAT_BIN "/usr/bin/stat"
+#define BLOCKDEV_BIN "/usr/sbin/blockdev"
#define LOSETUP_BIN "/sbin/losetup"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.65/utils/transmogrify.cc
new/libstorage-ng-4.4.66/utils/transmogrify.cc
--- old/libstorage-ng-4.4.65/utils/transmogrify.cc 2021-12-04
02:18:23.000000000 +0100
+++ new/libstorage-ng-4.4.66/utils/transmogrify.cc 2021-12-17
12:13:30.000000000 +0100
@@ -41,14 +41,14 @@
else if (command == "remove+")
{
Device* device = staging->find_device(std::stoi(commands[index++]));
- device->remove_descendants();
+ device->remove_descendants(View::CLASSIC);
staging->remove_device(device);
}
// only remove descendants of device with sid
else if (command == "remove+-")
{
Device* device = staging->find_device(std::stoi(commands[index++]));
- device->remove_descendants();
+ device->remove_descendants(View::CLASSIC);
}
// keep device with sid and its descendants
else if (command == "keep+")
