Apply upstream fix for AttributeError in fsminsize

Fixes QubesOS/qubes-issues#3050

blivet/0001-Fix-AttributeError-in-fsminsize-1502587.patch

@@ -0,0 +1,34 @@
+From b4407b21415f6ede2542ef044fdc5d45b5dd5c48 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Mon, 16 Oct 2017 12:57:44 +0200
+Subject: [PATCH] Fix AttributeError in fsminsize (#1502587)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ blivet/tasks/fsminsize.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/blivet/tasks/fsminsize.py b/blivet/tasks/fsminsize.py
+index ab6c647b..620b7dca 100644
+--- a/blivet/tasks/fsminsize.py
++++ b/blivet/tasks/fsminsize.py
+@@ -128,12 +128,12 @@ class Ext2FSMinSize(FSMinSize):
+ 
+         block_size = self._extract_block_size()
+         if block_size is None:
+-            raise FSError("failed to get block size for %s filesystem on %s" % (self.fs.mount_type, self.fs.device.name))
++            raise FSError("failed to get block size for %s filesystem on %s" % (self.fs.mount_type, self.fs.device))
+ 
+         resize_info = self._get_resize_info()
+         num_blocks = self._extract_num_blocks(resize_info)
+         if num_blocks is None:
+-            raise FSError("failed to get minimum block number for %s filesystem on %s" % (self.fs.mount_type, self.fs.device.name))
++            raise FSError("failed to get minimum block number for %s filesystem on %s" % (self.fs.mount_type, self.fs.device))
+ 
+         return block_size * num_blocks
+ 
+-- 
+2.13.6
+

blivet/python-blivet.spec

@@ -25,6 +25,7 @@ Patch4: 0001-Fix-detection-of-macefi-partitions-1393846.patch
 Patch5: 0001-Fix-unknown-SAS-device-sysfs-parsing.patch
 Patch6: 0001-Change-how-we-run-e2fsck-to-check-ext-filesystems.patch
 Patch7: 0002-Do-not-run-FS-check-as-part-of-updating-re-size-info.patch
+Patch8: 0001-Fix-AttributeError-in-fsminsize-1502587.patch
 
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
@@ -82,6 +83,7 @@ configuration.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 rm -rf %{py3dir}
 cp -a . %{py3dir}