From 692f6518e9003618a6582a0b7e1e175963c544fb Mon Sep 17 00:00:00 2001
From: mikeeq <miotk.mikolaj@gmail.com>
Date: Thu, 4 Nov 2021 14:05:36 +0100
Subject: [PATCH] Fix Fedora 35 build

---
 .gitignore        | 1 +
 imgcreate/live.py | 6 +++---
 imgcreate/util.py | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..b0943b23
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+**.8
diff --git a/imgcreate/live.py b/imgcreate/live.py
index e71cc493..040a0559 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -636,8 +636,8 @@ def __get_memtest_stanza(self, isodir):
         return """label memtest
   menu label Run a ^memory test.
   text help
-    If your system is having issues, an problem with your 
-    system's memory may be the cause. Use this utility to 
+    If your system is having issues, an problem with your
+    system's memory may be the cause. Use this utility to
     see if the memory is working correctly.
   endtext
   kernel memtest
@@ -720,7 +720,7 @@ def __copy_efi_files(self, isodir):
                  ("/boot/efi/EFI/*/gcd%s.efi" % (self.efiarch.lower(),), "/EFI/BOOT/grub%s.efi" % (self.efiarch.lower(),), True),
                  ("/boot/efi/EFI/*/shimia32.efi", "/EFI/BOOT/BOOTIA32.EFI", False),
                  ("/boot/efi/EFI/*/gcdia32.efi", "/EFI/BOOT/grubia32.efi", False),
-                 ("/boot/efi/EFI/*/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
+                 ("/boot/*/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
                 ]
         makedirs(isodir+"/EFI/BOOT/fonts/")
         for src, dest, required in files:
diff --git a/imgcreate/util.py b/imgcreate/util.py
index 5586fb47..492b86e1 100644
--- a/imgcreate/util.py
+++ b/imgcreate/util.py
@@ -20,7 +20,7 @@
 import subprocess
 import logging
 import io
-from errors import *
+# from errors import *
 
 def call(*popenargs, **kwargs):
     """