From 29526cfc94ba15cff38e2b7d234fe29654e60032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Fri, 19 Jul 2019 11:11:53 +0200 Subject: [PATCH] gather: Mark repos as containing module hotfixes --- ...-repos-as-containing-module-hotfixes.patch | 36 +++++++++++++++++++ pungi.spec | 6 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-gather-Mark-repos-as-containing-module-hotfixes.patch diff --git a/0001-gather-Mark-repos-as-containing-module-hotfixes.patch b/0001-gather-Mark-repos-as-containing-module-hotfixes.patch new file mode 100644 index 00000000..f773ad75 --- /dev/null +++ b/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?= +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ář +--- + 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 + diff --git a/pungi.spec b/pungi.spec index 36484aef..f8538031 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,12 +2,13 @@ Name: pungi Version: 4.1.38 -Release: 1%{?dist} +Release: 2%{?dist} 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 @@ -202,6 +203,9 @@ nosetests-3 --exe %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Fri Jul 19 2019 Lubomír Sedlář - 4.1.38-2 +- gather: Mark repos as containing module hotfixes + * Tue Jul 02 2019 Lubomír Sedlář - 4.1.38-1 - Remove remaining mentions of runroot option (lsedlar) - pkgset: Include module metadata in the repos (lsedlar)