Hello community,
here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2019-11-01 15:13:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Fri Nov 1 15:13:34 2019 rev:67 rq:744493 version:4.2.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2019-10-21 12:27:27.939897099 +0200
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.2990/libstorage-ng.changes 2019-11-01 15:13:34.692711249 +0100
@@ -1,0 +2,14 @@
+Thu Oct 31 13:16:21 UTC 2019 - aschnell@suse.com
+
+- merge gh#openSUSE/libstorage-ng#676
+- handle is_permanent() in possible_mount_bys() (bsc#1155566)
+- simplified code
+- 4.2.19
+
+--------------------------------------------------------------------
+Mon Oct 28 14:20:38 UTC 2019 - opensuse-packaging@opensuse.org
+
+- Translated using Weblate (Estonian) (bsc#1149754)
+- 4.2.18
+
+--------------------------------------------------------------------
Old:
----
libstorage-ng-4.2.17.tar.xz
New:
----
libstorage-ng-4.2.19.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.nMnJRY/_old 2019-11-01 15:13:36.300713346 +0100
+++ /var/tmp/diff_new_pack.nMnJRY/_new 2019-11-01 15:13:36.324713377 +0100
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.2.17
+Version: 4.2.19
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
++++++ libstorage-ng-4.2.17.tar.xz -> libstorage-ng-4.2.19.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.17/VERSION new/libstorage-ng-4.2.19/VERSION
--- old/libstorage-ng-4.2.17/VERSION 2019-10-18 13:07:38.000000000 +0200
+++ new/libstorage-ng-4.2.19/VERSION 2019-10-31 14:16:21.000000000 +0100
@@ -1 +1 @@
-4.2.17
+4.2.19
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.17/po/et.po new/libstorage-ng-4.2.19/po/et.po
--- old/libstorage-ng-4.2.17/po/et.po 2019-10-18 13:07:38.000000000 +0200
+++ new/libstorage-ng-4.2.19/po/et.po 2019-10-31 14:16:21.000000000 +0100
@@ -7,26 +7,30 @@
"Project-Id-Version: autoinst.fi\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-04 09:26+0200\n"
-"PO-Revision-Date: 2003-09-22 13:26+0200\n"
-"Last-Translator: Ain Vagula \n"
-"Language-Team: Estonian \n"
+"PO-Revision-Date: 2019-10-28 16:53+0000\n"
+"Last-Translator: Jaanus Ojangu \n"
+"Language-Team: Estonian <https://l10n.opensuse.org/projects/libstorage/"
+"ng-master/et/>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.6.1\n"
msgid ""
"\n"
"are you serious?!"
msgstr ""
+"\n"
+"mõtlesid sa seda tõsiselt?!"
#. TRANSLATORS: appended after list of value to indicate that some
#. values have been omitted
#. %1$d is replaced by the number of elements omitted
#, c-format
msgid "%1$d more"
-msgstr ""
+msgstr "%1$d veel"
#. TRANSLATORS:
#. %1$s is replaced with the device name (e.g. /dev/sdc1),
@@ -41,7 +45,7 @@
#. %2$s is replaced by the number of elements omitted
#, c-format
msgid "%1$s and %2$d more"
-msgstr ""
+msgstr "%1$s väärtused ja elemendid %2$d veel"
#. TRANSLATORS: used to construct list of values
#. %1$s is replaced by first value
@@ -56,7 +60,7 @@
#. (e.g. "/dev/sdb1 (64 GiB), /dev/sdc1 (160 GiB)")
#, c-format
msgid "%1$s is cached by %2$s"
-msgstr ""
+msgstr "%1$s on salvestatud vahemällu %2$s poolt"
#. TRANSLATORS: used to construct list of values
#. %1$s is replaced by first value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.17/storage/Filesystems/BlkFilesystemImpl.cc new/libstorage-ng-4.2.19/storage/Filesystems/BlkFilesystemImpl.cc
--- old/libstorage-ng-4.2.17/storage/Filesystems/BlkFilesystemImpl.cc 2019-10-18 13:07:38.000000000 +0200
+++ new/libstorage-ng-4.2.19/storage/Filesystems/BlkFilesystemImpl.cc 2019-10-31 14:16:21.000000000 +0100
@@ -125,10 +125,10 @@
{
vector<MountByType> ret;
- if (supports_uuid())
+ if (supports_uuid() && is_permanent())
ret.push_back(MountByType::UUID);
- if (supports_label())
+ if (supports_label() && is_permanent())
ret.push_back(MountByType::LABEL);
return ret;
@@ -626,17 +626,21 @@
switch (mount_point->get_mount_by())
{
case MountByType::UUID:
- if (!uuid.empty())
- ret = "UUID=" + uuid;
- else
+ if (!is_permanent())
+ y2war("no uuid possible for non-permanent filesystem, using fallback mount-by");
+ else if (uuid.empty())
y2war("no uuid defined, using fallback mount-by");
+ else
+ ret = "UUID=" + uuid;
break;
case MountByType::LABEL:
- if (!label.empty())
- ret = "LABEL=" + label;
- else
+ if (!is_permanent())
+ y2war("no label possible for non-permanent filesystem, using fallback mount-by");
+ else if (label.empty())
y2war("no label defined, using fallback mount-by");
+ else
+ ret = "LABEL=" + label;
break;
case MountByType::ID:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.17/storage/Filesystems/BlkFilesystemImpl.h new/libstorage-ng-4.2.19/storage/Filesystems/BlkFilesystemImpl.h
--- old/libstorage-ng-4.2.17/storage/Filesystems/BlkFilesystemImpl.h 2019-10-18 13:07:38.000000000 +0200
+++ new/libstorage-ng-4.2.19/storage/Filesystems/BlkFilesystemImpl.h 2019-10-31 14:16:21.000000000 +0100
@@ -165,6 +165,16 @@
static bool detect_is_efi(const string& mountpoint);
static unsigned detect_num_homes(const string& mountpoint);
+ /**
+ * Checks whether the filesystem is permanent. A non permanent
+ * filesystem cannot use mount-by uuid or label.
+ *
+ * E.g. a swap located on a plain encryption with the swap
+ * option set in /etc/crypttab is not permanent since it is
+ * regenerated at every boot.
+ */
+ virtual bool is_permanent() const { return true; }
+
private:
string label;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.17/storage/Filesystems/SwapImpl.cc new/libstorage-ng-4.2.19/storage/Filesystems/SwapImpl.cc
--- old/libstorage-ng-4.2.17/storage/Filesystems/SwapImpl.cc 2019-10-18 13:07:38.000000000 +0200
+++ new/libstorage-ng-4.2.19/storage/Filesystems/SwapImpl.cc 2019-10-31 14:16:21.000000000 +0100
@@ -104,41 +104,6 @@
}
- string
- Swap::Impl::get_mount_by_name(const MountPoint* mount_point) const
- {
- MountByType mount_by = mount_point->get_mount_by();
-
- switch (mount_by)
- {
- case MountByType::UUID:
- if (!is_permanent())
- {
- y2war("no uuid possible for non-permanent swap, using fallback mount-by");
- mount_by = MountByType::DEVICE;
- }
- break;
-
- case MountByType::LABEL:
- if (!is_permanent())
- {
- y2war("no label possible for non-permanent swap, using fallback mount-by");
- mount_by = MountByType::DEVICE;
- }
- break;
-
- case MountByType::ID:
- case MountByType::PATH:
- case MountByType::DEVICE:
- break;
- }
-
- const BlkDevice* blk_device = get_etc_fstab_blk_device(mount_point);
-
- return blk_device->get_impl().get_mount_by_name(mount_by);
- }
-
-
void
Swap::Impl::do_create()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.17/storage/Filesystems/SwapImpl.h new/libstorage-ng-4.2.19/storage/Filesystems/SwapImpl.h
--- old/libstorage-ng-4.2.17/storage/Filesystems/SwapImpl.h 2019-10-18 13:07:38.000000000 +0200
+++ new/libstorage-ng-4.2.19/storage/Filesystems/SwapImpl.h 2019-10-31 14:16:21.000000000 +0100
@@ -59,8 +59,6 @@
virtual bool supports_uuid() const override { return true; }
- virtual string get_mount_by_name(const MountPoint* mount_point) const override;
-
public:
Impl()
@@ -97,14 +95,9 @@
virtual void immediate_activate(MountPoint* mount_point, bool force_rw = false) const override;
virtual void immediate_deactivate(MountPoint* mount_point) const override;
- private:
+ protected:
- /**
- * Checks whether the swap is generated at every boot,
- * e.g. located on a plain encryption the swap option in
- * /etc/crypttab.
- */
- bool is_permanent() const;
+ virtual bool is_permanent() const override;
};