diff --git a/0001-Reset-all-module-when-system-upgrade-to-f31-32-RhBug-1767351.patch b/0001-Reset-all-module-when-system-upgrade-to-f31-32-RhBug-1767351.patch index 238253b..c2adfb5 100644 --- a/0001-Reset-all-module-when-system-upgrade-to-f31-32-RhBug-1767351.patch +++ b/0001-Reset-all-module-when-system-upgrade-to-f31-32-RhBug-1767351.patch @@ -1,4 +1,4 @@ -From 1f3710cfa7dae6e1440a9ce04cc1d477eced0fbf Mon Sep 17 00:00:00 2001 +From 53f4e99c05382a003fbd42753f55707e6d16f974 Mon Sep 17 00:00:00 2001 From: Jaroslav Mracek Date: Fri, 18 Oct 2019 10:54:09 +0200 Subject: [PATCH] Reset all module when system-upgrade to f31, 32 @@ -17,13 +17,13 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1767351 1 file changed, 10 insertions(+) diff --git a/plugins/system_upgrade.py b/plugins/system_upgrade.py -index 0a0a0d7..c08f58f 100644 +index 0a0a0d7..402daa3 100644 --- a/plugins/system_upgrade.py +++ b/plugins/system_upgrade.py -@@ -541,6 +541,16 @@ def run_download(self): - else: - self.base.upgrade_all() +@@ -535,6 +535,16 @@ def run_reboot(self): + reboot() + def run_download(self): + # downstream hack to narrow missing upgrade path with modules between dist versions + if self.opts.command not in ['offline-upgrade', 'offline-distrosync']: + if dnf.base.WITH_MODULES: @@ -34,6 +34,6 @@ index 0a0a0d7..c08f58f 100644 + # When no module is available, just pass + pass + - with self.state as state: - state.download_status = 'downloading' - state.target_releasever = self.base.conf.releasever + # Mark everything in the world for upgrade/sync + if self.opts.distro_sync: + self.base.distro_sync() diff --git a/dnf-plugins-extras.spec b/dnf-plugins-extras.spec index f45c96f..bef8773 100644 --- a/dnf-plugins-extras.spec +++ b/dnf-plugins-extras.spec @@ -15,7 +15,7 @@ Name: dnf-plugins-extras Version: 4.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extras Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/%{name} @@ -445,6 +445,9 @@ PYTHONPATH="%{buildroot}%{python3_sitelib}:%{buildroot}%{python3_sitelib}/dnf-pl %endif %changelog +* Fri Mar 06 2020 Ales Matej - 4.0.8-3 +- Fix patch to fix distribution issues with missing upgrade path between dist versions (RhBug:1767351) + * Wed Feb 26 2020 Ales Matej - 4.0.8-2 - Backport patch to fix distribution issues with missing upgrade path between dist versions (RhBug:1767351)