!10 update to version 3.2.2

Merge pull request !10 from zhangqiumiao/master

0002-Fix-options-for-ISCSI-functions-1632656.patch

@@ -1,42 +0,0 @@
-From 48d19a9835ebb6743ec03e4c9182c8cc74db4cf8 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Wed, 3 Oct 2018 14:11:08 +0200
-Subject: [PATCH] Fix options for ISCSI functions (#1632656)
-
-Correct mutual authentication options in UDisks are
-"reverse-username" and "reverse-password".
----
- blivet/iscsi.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/blivet/iscsi.py b/blivet/iscsi.py
-index b979e01c..ca51f8ed 100644
---- a/blivet/iscsi.py
-+++ b/blivet/iscsi.py
-@@ -385,9 +385,9 @@ class iSCSI(object):
-             if password:
-                 auth_info["password"] = GLib.Variant("s", password)
-             if r_username:
--                auth_info["r_username"] = GLib.Variant("s", r_username)
-+                auth_info["reverse-username"] = GLib.Variant("s", r_username)
-             if r_password:
--                auth_info["r_password"] = GLib.Variant("s", r_password)
-+                auth_info["reverse-password"] = GLib.Variant("s", r_password)
- 
-             args = GLib.Variant("(sqa{sv})", (ipaddr, int(port), auth_info))
-             nodes, _n_nodes = self._call_initiator_method("DiscoverSendTargets", args)
-@@ -423,9 +423,9 @@ class iSCSI(object):
-         if password:
-             auth_info["password"] = GLib.Variant("s", password)
-         if r_username:
--            auth_info["r_username"] = GLib.Variant("s", r_username)
-+            auth_info["reverse-username"] = GLib.Variant("s", r_username)
-         if r_password:
--            auth_info["r_password"] = GLib.Variant("s", r_password)
-+            auth_info["reverse-password"] = GLib.Variant("s", r_password)
- 
-         try:
-             self._login(node, auth_info)
--- 
-2.17.1
-

check-if-disklabel-supports-partition-names.patch

@@ -1,46 +0,0 @@
-From 6817db6f11ffbaac511c5d43129473910c80736e Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Sat, 21 Mar 2020 18:06:51 +0800
-Subject: [PATCH] check if disklabel supports partition names
-
-pyparted now raises an exception when trying to access partition 
-name on a disklabel that doesn't support partition names, see 
-https://github.com/dcantrell/pyparted/issues/59
----
- blivet/formats/disklabel.py      | 7 +++++++
- blivet/populator/helpers/boot.py | 1 +
- 2 files changed, 8 insertions(+)
-
-diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py
-index e13ab2f..125f2ba 100644
---- a/blivet/formats/disklabel.py
-+++ b/blivet/formats/disklabel.py
-@@ -329,6 +329,13 @@ class DiskLabel(DeviceFormat):
-         """ Device status. """
-         return False
- 
-+    @property
-+    def supports_names(self):
-+        if not self.supported or not self.parted_disk:
-+            return False
-+
-+        return self.parted_disk.supportsFeature(parted.DISK_TYPE_PARTITION_NAME)
-+
-     def _create(self, **kwargs):
-         """ Create the device. """
-         log_method_call(self, device=self.device,
-diff --git a/blivet/populator/helpers/boot.py b/blivet/populator/helpers/boot.py
-index 76eed22..5eee9ae 100644
---- a/blivet/populator/helpers/boot.py
-+++ b/blivet/populator/helpers/boot.py
-@@ -59,6 +59,7 @@ class MacEFIFormatPopulator(BootFormatPopulator):
-         fmt = formats.get_format(cls._type_specifier)
-         try:
-             return (super(MacEFIFormatPopulator, MacEFIFormatPopulator).match(data, device) and
-+                    device.disk.format.supports_names and
-                     device.parted_partition.name == fmt.name)
-         except AttributeError:
-             # just in case device.parted_partition has no name attr
--- 
-1.8.3.1
-

fix-the-long-hostname.patch

@@ -1,7 +1,7 @@
 diff -Nur blivet-3.1.1/blivet/devicelibs/lvm.py blivet-3.1.1-old/blivet/devicelibs/lvm.py
 --- blivet-3.1.1/blivet/devicelibs/lvm.py	2019-01-26 04:29:13.358210238 -0500
 +++ blivet-3.1.1-old/blivet/devicelibs/lvm.py	2019-01-26 04:29:54.489210238 -0500
-@@ -201,7 +201,7 @@
+@@ -219,7 +219,7 @@
      # minus the number of hyphens, and possibly minus up to another 8 characters
      # in some unspecified set of situations. Instead of figuring all of that out,
      # no one gets a vg or lv name longer than, let's say, 55.

python-blivet.spec

@@ -1,13 +1,13 @@
 %bcond_with enable_python2
 
 Name:           python-blivet
-Version:        3.1.1
+Version:        3.2.2
-Release:        8
+Release:        1
 Epoch:          1
 Summary:        A python module for system storage configuration
 License:        LGPLv2+
 URL:            https://storageapis.wordpress.com/projects/blivet
-Source0:        http://github.com/storaged-project/blivet/archive/blivet-%{version}.tar.gz
+Source0:        http://github.com/storaged-project/blivet/releases/download/blivet-%{version}/blivet-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  systemd gettext python3-devel python3-setuptools
@@ -17,12 +17,9 @@ BuildRequires:  python2-devel python2-setuptools
 %endif
 
 Patch0:         0001-force-lvm-plugin.patch
-Patch1:         0002-Fix-options-for-ISCSI-functions-1632656.patch
 
 Patch9000:      fix-the-long-hostname.patch
 
-# from upstream https://github.com/dcantrell/pyparted/issues/59
-Patch6000:      check-if-disklabel-supports-partition-names.patch
 
 %description
 The python-blivet package is a python module for examining and modifying
@@ -123,6 +120,12 @@ make PYTHON=%{__python2} DESTDIR=%{buildroot} install
 %doc README
 
 %changelog
+* Thu Jun 18 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 3.1.7
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:upgrate to version 3.1.7
+
 * Sat Mar 21 2020 songnannan <songnannan@huawei.com> - 3.1.1-8
 - bugfix about update