From 0934e8f86be7df544b8405491f60fa7614a7a3bf Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Aug 25 2021 13:36:12 +0000
Subject: import guestfs before dnf


Fixes: https://pagure.io/koji/issue/2964

---

diff --git a/builder/kojid b/builder/kojid
index 94b1409..2fc1c51 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -48,8 +48,18 @@ from fnmatch import fnmatch
 from gzip import GzipFile
 from optparse import SUPPRESS_HELP, OptionParser
 
-import Cheetah.Template
+try:
+    # Due to https://bugzilla.redhat.com/show_bug.cgi?id=1923971
+    # and https://pagure.io/koji/issue/2964
+    # guestfs needs to be imported before dnf, so json libraries will
+    # load in non-breaking order (guestfs would be otherwise imported
+    # by ImageFactory/Oz
+    import guestfs  # noqa: F401
+except ImportError:
+    pass
 import dnf
+
+import Cheetah.Template
 import librepo
 import requests
 import rpm