From 14784847d4fe0408bbbdff9d3c8ee69417799ecc Mon Sep 17 00:00:00 2001
From: Lubos Kocman <lkocman@redhat.com>
Date: Mar 24 2017 08:24:47 +0000
Subject: add dnf_arch wrapper to workaround dnf.arch.basearch -> dnf.rpm.basearch change


Signed-off-by: Lubos Kocman <lkocman@redhat.com>

---

diff --git a/pungi/dnf_wrapper.py b/pungi/dnf_wrapper.py
index 7be4482..c049a8a 100644
--- a/pungi/dnf_wrapper.py
+++ b/pungi/dnf_wrapper.py
@@ -25,13 +25,18 @@ import shutil
 import tempfile
 
 import dnf
-import dnf.arch
+
 import dnf.conf
 import dnf.repo
 import dnf.sack
 
 import pungi.arch
 
+try:
+    import dnf.rpm as dnf_arch
+except ImportError:
+    import dnf.arch as dnf_arch
+
 
 class Conf(dnf.conf.Conf):
     # This is only modified to get our custom Substitutions class in.
@@ -45,7 +50,7 @@ class Substitutions(dict):
     def __init__(self, arch):
         super(Substitutions, self).__init__()
         self['arch'] = arch
-        self['basearch'] = dnf.arch.basearch(arch)
+        self['basearch'] = dnf_arch.basearch(arch)
 
 
 class DnfWrapper(dnf.Base):
@@ -145,7 +150,7 @@ class CompsWrapper(object):
 
 class ArchWrapper(object):
     def __init__(self, arch):
-        self.base_arch = dnf.arch.basearch(arch)
+        self.base_arch = dnf_arch.basearch(arch)
         self.all_arches = pungi.arch.get_valid_arches(self.base_arch, multilib=True, add_noarch=True)
         self.native_arches = pungi.arch.get_valid_arches(self.base_arch, multilib=False, add_noarch=True)
         self.multilib_arches = pungi.arch.get_valid_multilib_arches(self.base_arch)