Merge branch 'f30'

0001-gather-Mark-repos-as-containing-module-hotfixes.patch

@@ -0,0 +1,36 @@
+From 3f4c084ba07ac2a4bcee499dceee9e1b7cc7fbdf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
+Date: Fri, 19 Jul 2019 11:04:01 +0200
+Subject: [PATCH] gather: Mark repos as containing module hotfixes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This should prevent DNF from doing any unwanted magic with the contents.
+Ideally we want it to completely ignore the modular metadata in there,
+but there seems to be no way to do that.
+
+This should at least prevent it from hiding non-modular packages that
+are masked by some default stream.
+
+Fixes: https://pagure.io/pungi/issue/1241
+Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
+---
+ pungi/dnf_wrapper.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pungi/dnf_wrapper.py b/pungi/dnf_wrapper.py
+index cef9c397..798b2f8f 100644
+--- a/pungi/dnf_wrapper.py
++++ b/pungi/dnf_wrapper.py
+@@ -59,6 +59,7 @@ class DnfWrapper(dnf.Base):
+             baseurl=[baseurl],
+             enabledgroups=enablegroups,
+             priority=10 if lookaside else 20,
++            module_hotfixes=True,
+         )
+ 
+ 
+-- 
+2.21.0
+

pungi.spec

@@ -8,6 +8,7 @@ Summary:        Distribution compose tool
 License:        GPLv2
 URL:            https://pagure.io/pungi
 Source0:        https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         0001-gather-Mark-repos-as-containing-module-hotfixes.patch
 
 BuildRequires:  python3-nose
 BuildRequires:  python3-mock