Apply patch reverting changes that require new Anaconda (#1497677)

This patch was removed by accident in 2.1.11-1

.gitignore

@@ -102,3 +102,6 @@
 /blivet-2.1.5.tar.gz
 /blivet-2.1.6.tar.gz
 /blivet-2.1.7.tar.gz
+/blivet-2.1.9.tar.gz
+/blivet-2.1.10.tar.gz
+/blivet-2.1.11.tar.gz

0001-Fix-unknown-SAS-device-sysfs-parsing.patch

@@ -1,34 +0,0 @@
-From 7a9697eae467fc0ed44022d948f70f30d156d69e Mon Sep 17 00:00:00 2001
-From: Adam Williamson <adamw@fedoraproject.org>
-Date: Fri, 11 Nov 2016 12:36:12 -0500
-Subject: [PATCH] Fix "unknown" SAS device sysfs parsing.
-
-Since the regexp matches the device type as well as the identifying
-numbers, we need to pull the numbers from match groups 2 and 3, not 1
-and 2.
-
-Resolves: rhbz#1394026
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- blivet/devicelibs/edd.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/blivet/devicelibs/edd.py b/blivet/devicelibs/edd.py
-index 7a1a1e2..51b7ed8 100644
---- a/blivet/devicelibs/edd.py
-+++ b/blivet/devicelibs/edd.py
-@@ -316,8 +316,8 @@ class EddEntry(object):
-                         self.sas_address = int(sas_match.group(1), base=16)
-                         self.sas_lun = int(sas_match.group(2), base=16)
-                     elif unknown_match:
--                        self.sas_address = int(unknown_match.group(1), base=16)
--                        self.sas_lun = int(unknown_match.group(2), base=16)
-+                        self.sas_address = int(unknown_match.group(2), base=16)
-+                        self.sas_lun = int(unknown_match.group(3), base=16)
-                     else:
-                         log.warning("edd: can not match interface for %s: %s",
-                                     self.sysfspath, interface)
--- 
-2.7.4
-

0001-Revert-Anaconda-unreleased-changes.patch

@@ -0,0 +1,53 @@
+From df0bd061577667c3780b81f5b0941792f6bac86a Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Fri, 16 Jun 2017 10:20:25 +0200
+Subject: [PATCH 1/2] Revert "Use structured logging for the anaconda logger"
+
+This reverts commit ca404db665eb2db9215393ac3718371a1aa8d0b8.
+---
+ blivet/autopart.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/blivet/autopart.py b/blivet/autopart.py
+index 35742a4..5278850 100644
+--- a/blivet/autopart.py
++++ b/blivet/autopart.py
+@@ -37,7 +37,7 @@ from .static_data import luks_data
+ from pykickstart.constants import AUTOPART_TYPE_BTRFS, AUTOPART_TYPE_LVM, AUTOPART_TYPE_LVM_THINP, AUTOPART_TYPE_PLAIN
+ 
+ import logging
+-log = logging.getLogger("anaconda.blivet.autopart")
++log = logging.getLogger("anaconda")
+ 
+ # maximum ratio of swap size to disk size (10 %)
+ MAX_SWAP_DISK_RATIO = Decimal('0.1')
+-- 
+1.8.3.1
+
+
+From f4fa2600e719402729177e997956a44f3260bdb8 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Fri, 16 Jun 2017 10:20:36 +0200
+Subject: [PATCH 2/2] Revert "Adapt to logging module name change"
+
+This reverts commit c367d62a516e541ad28636c8259321f1c53417ce.
+---
+ blivet/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/blivet/__init__.py b/blivet/__init__.py
+index 1657e07..a9d9394 100644
+--- a/blivet/__init__.py
++++ b/blivet/__init__.py
+@@ -124,7 +124,7 @@ def enable_installer_mode():
+         from pyanaconda.constants import ROOT_PATH  # pylint: disable=redefined-outer-name,no-name-in-module
+         _storage_root = _sysroot = ROOT_PATH
+ 
+-    from pyanaconda.anaconda_logging import program_log_lock
++    from pyanaconda.anaconda_log import program_log_lock
+     util.program_log_lock = program_log_lock
+ 
+     flags.installer_mode = True
+-- 
+1.8.3.1
+

530.patch

@@ -1,30 +0,0 @@
-From 67d36789c8ff88b4ba14da7022f63b6831d75da3 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Thu, 22 Dec 2016 15:09:47 -0800
-Subject: [PATCH] Shallow copy another alignment property (#1408282)
-
-Several blivet classes use custom __deepcopy__ methods to avoid
-deep copying some parted objects which we know can't be deep
-copied. Unfortunately the list of attributes excepted from deep
-copying for `DiskLabel` was missing one parted Alignment object,
-and with Python 3.6, we blow up trying to deepcopy that. This
-fixes the problem by adding that attribute to the list of ones
-we know have to be shallow copied.
----
- blivet/formats/disklabel.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py
-index f6b9d83..2dad706 100644
---- a/blivet/formats/disklabel.py
-+++ b/blivet/formats/disklabel.py
-@@ -90,7 +90,8 @@ def __deepcopy__(self, memo):
-             We can't do copy.deepcopy on parted objects, which is okay.
-         """
-         return util.variable_copy(self, memo,
--                                  shallow=('_parted_device', '_optimal_alignment', '_minimal_alignment',),
-+                                  shallow=('_parted_device', '_optimal_alignment', '_minimal_alignment',
-+                                           '_disk_label_alignment'),
-                                   duplicate=('_parted_disk', '_orig_parted_disk'))
- 
-     def __repr__(self):

python-blivet.spec

@@ -1,38 +1,31 @@
 Summary:  A python module for system storage configuration
 Name: python-blivet
-Url: http://fedoraproject.org/wiki/blivet
-Version: 2.1.7
+Url: https://www-rhstorage.rhcloud.com/projects/blivet
+Version: 2.1.11
 
 #%%global prerelease .b1
 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2
-Release: 7%{?prerelease}%{?dist}
+Release: 2%{?prerelease}%{?dist}
 Epoch: 1
 License: LGPLv2+
 Group: System Environment/Libraries
 %global realname blivet
 %global realversion %{version}%{?prerelease}
-Source0: http://github.com/rhinstaller/blivet/archive/%{realname}-%{realversion}.tar.gz
-
-Patch0: 0001-Fix-unknown-SAS-device-sysfs-parsing.patch
-# Fix crash with Python 3.6:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1408282
-Patch1: https://github.com/rhinstaller/blivet/pull/530.patch
+Source0: http://github.com/storaged-project/blivet/archive/%{realname}-%{realversion}.tar.gz
+Patch0: 0001-Revert-Anaconda-unreleased-changes.patch
 
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 %global pykickstartver 1.99.22
-%global pocketlintver 0.4
 %global partedver 1.8.1
 %global pypartedver 3.10.4
-%global e2fsver 1.41.0
 %global utillinuxver 2.15.1
-%global libblockdevver 2.1
+%global libblockdevver 2.6
 %global libbytesizever 0.3
 %global pyudevver 0.18
 
 BuildArch: noarch
 BuildRequires: gettext
-BuildRequires: python3-pocketlint >= %{pocketlintver}
 BuildRequires: python3-devel python3-setuptools
 
 %description
@@ -52,10 +45,7 @@ Requires: python3-blockdev >= %{libblockdevver}
 Requires: libblockdev-plugins-all >= %{libblockdevver}
 Requires: python3-bytesize >= %{libbytesizever}
 Requires: util-linux >= %{utillinuxver}
-Requires: dosfstools
-Requires: e2fsprogs >= %{e2fsver}
 Requires: lsof
-Requires: python3-hawkey
 Requires: python3-gobject-base
 Requires: systemd-udev
 Obsoletes: blivet-data < 1:2.0.3
@@ -68,7 +58,6 @@ configuration.
 %prep
 %setup -q -n %{realname}-%{realversion}
 %patch0 -p1
-%patch1 -p1
 
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -88,6 +77,108 @@ make PYTHON=%{__python3} DESTDIR=%{buildroot} install
 %{python3_sitelib}/*
 
 %changelog
+* Tue Sep 19 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.1.11-1
+- Remove build requires for pocketlint (rkuska)
+- edd_test: don't run on non-x86 (pjones)
+- Added support for device tags (japokorn)
+- fcoe: don't use dcb for autoconnecting of bnx2x and bnx2fc (#1261703)
+  (rvykydal)
+- fcoe: replace fipvlan with fcoemon (#1085325) (rvykydal)
+- Do not use read-only mode for e2fsck (vpodzime)
+- Fixed behavior when selinux is disabled (japokorn)
+- Do file system check before resize (#1484575) (vpodzime)
+
+* Thu Aug 17 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.1.10-1
+- Use addCleanup for test cleanup instead of clening in tearDown (vtrefny)
+- No longer skip test w/o selinux; mocked (japokorn)
+- Skip tests when SELinux is disabled (japokorn)
+- New test for selinux context setting when mounting (japokorn)
+- Add tests for disklabel type selection and partition weight. (dlehman)
+- Do not use package version to check version of installed tools (vtrefny)
+- Update the upstream git URL (vpodzime)
+- Stop enforcing obsolete limits on partition count. (#1460668) (dlehman)
+- Do not run FS check as part of updating (re)size info (vpodzime)
+- Change how we run e2fsck to check ext filesystems (vpodzime)
+- Round the recommended thpool metadata size to extents (vpodzime)
+- Respect thin pool's min size when setting its req_size (vpodzime)
+- Don't crash during populate when lvm plugin is missing. (dlehman)
+- Actually add space for LUKS metadata when encrypting a VG (vpodzime)
+- Only consider old and new device sizes when not growing to max (vpodzime)
+- Do not reserve space for LVM metadata twice (vpodzime)
+- Do not create a temporary list for sum() (vpodzime)
+- Refer to self.container as self.vg in the LVMFactory (vpodzime)
+- Add a couple of extra comments and docstrings to factories (vpodzime)
+- Use existing VG's PE size if available in LVMFactory (vpodzime)
+- Add comments warning before a weird nomenclature in factories (vpodzime)
+- Don't let device state block modification of the model. (dlehman)
+- Fix error message for format create w/ missing external dep. (dlehman)
+- Expand coverage of devices_test.dependencies_test a bit. (dlehman)
+- Account for external dep availabilty in StorageDevice.controllable. (dlehman)
+- Add the appropriate external dependency to LUKSDevice. (dlehman)
+
+* Thu Jun 01 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.1.9-1
+- Adapt to logging module name change (mkolman)
+- Updated calls to avoid log spamming (japokorn)
+- Add a script for generating and pushing updated documentation (vtrefny)
+- pylint: ignore some false positive warnings in blivet.py and lvm.py (vtrefny)
+- pylint: remove unused false positives from pocketlint config (vtrefny)
+- pylint: disable false positive "not-context-manager" for threading.Lock
+  (vtrefny)
+- pylint: ignore "arguments-differ" warnings in blivet.size.Size (vtrefny)
+- pylint: fix various "arguments-differ" warnings (vtrefny)
+- pylint: remove init from platform.X86 (vtrefny)
+- pylint: fix various errors in tests (vtrefny)
+- pylint: ignore "arguments-differ" warning for "do_tasks" method (vtrefny)
+- pylint: fix false positive for "catching-non-exception" (vtrefny)
+- pylint: fix argument name for Device._remove_parent/_add_parent (vtrefny)
+- Always mount & unmount an XFS file system when writing new UUID (vpodzime)
+- Do not remove manually created extended partitions (#1440150) (vtrefny)
+- Look the disk up for a partition by name not sys_name (vpodzime)
+- Disable pylint "no-member" warnings for re module constants (vtrefny)
+- Allow custom chunk size specification for MDRaidArrayDevice (vtrefny)
+- Add RAID chunk size to the generated kickstart file (vtrefny)
+- Use structured logging for the anaconda logger (mkolman)
+- Use distutils.spawn.find_executable instead of our custom code (vpodzime)
+- Add a method to reset file system's UUID (vpodzime)
+- Try to mount and unmount an XFS FS when writing UUID (vpodzime)
+- Add a method for a file system to generate a new UUID (vpodzime)
+- tests/fsuuid: Implement checking invalid UUIDs (aszlig)
+- formats/swap: Support setting UUID (aszlig)
+- tests: Add a series of tests for setting UUIDs (aszlig)
+- tests: Add tests to check the UUID format checkers (aszlig)
+- tasks: Implement setting UUID after FS creation (aszlig)
+- formats/fs: Implement setting UUID during mkfs (aszlig)
+- formats/fs: Add functionality for checking UUIDs (aszlig)
+- tasks/fsmkfs: Add arguments for setting UUID (aszlig)
+- Properly unset mountpoint of a snapshot's format (vpodzime)
+- Update snapshot's format's exists flag based on its origin (vpodzime)
+
+* Wed Apr 19 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.1.8-1
+- Fix "unknown" SAS device sysfs parsing. (adamw)
+- Reserve space in a VG when using LVMThinPFactory (vpodzime)
+- Reserve space in a VG instead of padding thin pools on autopart (vpodzime)
+- Focus the nonzero disk image size test a bit. (dlehman)
+- Add missing tearDown method to luks resize test case. (dlehman)
+- Fix some flag stomping in tests. (dlehman)
+- Remove the useless method requiredDiskLabelType (vponcova)
+- FBA DASD should use the msdos disk label type (vponcova)
+- Be more careful when checking for udisks-iscsi availability (vpodzime)
+- Do not allow resize of devices with no/unrecoginized formatting. (#1033778)
+  (dlehman)
+- Clean up parent/child relations on partition ctor error. (#1383873) (dlehman)
+- Use all ancestors when adding RAID disks to exclusiveDisks (vtrefny)
+- Fix detection of linear MD RAID (vtrefny)
+- Add 'discard' option to crypttab for newly created LUKS (vpodzime)
+- Loop devices w/o backing file are now ignored (japokorn)
+- Set parted boot flag when creating EFI filesystem (vtrefny)
+- formats/fs: Set NTFS to be formattable (aszlig)
+- Do not try to search for 'tmpfs' devices in udev database (vtrefny)
+- Fix resize test in fstesting (vtrefny)
+- Fix task availability test (vtrefny)
+- Shallow copy another alignment property (#1408282) (awilliam)
+- Fix the test dependencies (vpodzime)
+- Add 'systemd-udev' to dependencies (#1392591) (vtrefny)
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
@@ -109,21 +200,17 @@ make PYTHON=%{__python3} DESTDIR=%{buildroot} install
 * Mon Nov 21 2016 Vratislav Podzimek <vpodzime@redhat.com> - 2.1.7-1
 - Require BlockDev 2.0 in the gi.require_version() call (vpodzime)
 - Fix detection of 'macefi' partitions (#1393846) (awilliam)
+- Add device symlinks to the PVs dictionary for MD RAID PVs (#1389130)
+  (vpodzime)
+- iSCSI: turn `iscsi.initiator_set` into a property (awilliam)
+- iSCSI: Store auth info in NodeInfo tuples (awilliam)
+- Use correct type for port in GVariant tuple (awilliam)
 - Use a list comprehension for _to_node_infos (awilliam)
 - Device name now checked only for new devices (japokorn)
 - Remove several redundant teardown calls. (dlehman)
 - Cache and reuse data about multipath members (vpodzime)
 - Remove some obsolete pvscan calls. (dlehman)
 
-* Mon Nov 07 2016 David Lehman <dlehman@redhat.com> - 2.1.6-3
-- Never update POT file as part of rpm build.
-
-* Mon Nov 07 2016 David Lehman <dlehman@redhat.com> - 2.1.6-2
-- Use correct type for port in GVariant tuple (awilliam)
-- iSCSI: Store auth info in NodeInfo tuples (awilliam)
-- iSCSI: turn `iscsi.initiator_set` into a property (awilliam)
-- Add device symlinks to the PVs dictionary for MD RAID PVs (#1389130) (vpodzime)
-
 * Tue Oct 04 2016 David Lehman <dlehman@redhat.com> - 2.1.6-1
 - add missing populators to populator.helpers (awilliam)
 

sources

@@ -1 +1 @@
-bd44908b9f8d27bd85d9e66dde5d8414  blivet-2.1.7.tar.gz
+SHA512 (blivet-2.1.11.tar.gz) = b5457f6d7ad8eb1088900c5f792dcb1bd86eee8df7b179a54c408c43570f54a76d4f24d1a510df08499beb3173b08be29adad7a7cf1072e2985c97bd5ff8720d