PR#2: Reset module streams on F32 distro upgrade - rpms/PackageKit

Stephen Gallagher • 4 years ago

e2a9dde

file added

+36

		`@@ -0,0 +1,36 @@`
		`+ From f6752f222e71db4126acc1801d265e204f84b48f Mon Sep 17 00:00:00 2001`
		`+ From: Stephen Gallagher <sgallagh@redhat.com>`
		`+ Date: Thu, 12 Mar 2020 15:32:23 -0400`
		`+ Subject: [PATCH] Reset all module streams on upgrade to Fedora 32`
		`+`
		`+ Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>`
		`+ ---`
		`+ backends/dnf/pk-backend-dnf.c \| 12 ++++++++++++`
		`+ 1 file changed, 12 insertions(+)`
		`+`
		`+ diff --git a/backends/dnf/pk-backend-dnf.c b/backends/dnf/pk-backend-dnf.c`
		`+ index 572494900d6dae81a33da0a946e1c2bdee97eae5..7e2641f9a3189573ba564653b89cdead67921f3c 100644`
		`+ --- a/backends/dnf/pk-backend-dnf.c`
		`+ +++ b/backends/dnf/pk-backend-dnf.c`
		`+ @@ -3446,6 +3446,18 @@ pk_backend_upgrade_system_thread (PkBackendJob job, GVariant params, gpointer`
		`+ }`
		`+ }`
		`+`
		`+ + /* Downstream hack to forcibly reset module defaults when upgrading`
		`+ + * to Fedora 32.`
		`+ + */`
		`+ + if (g_strcmp0 (release_ver, "32") == 0) {`
		`+ + ret = dnf_context_reset_all_modules (job_data->context, sack, &error);`
		`+ + if (!ret) {`
		`+ + g_debug ("failed to reset all modules: %s", error->message);`
		`+ + pk_backend_job_error_code (job, error->code, "%s", error->message);`
		`+ + return;`
		`+ + }`
		`+ + }`
		`+ +`
		`+ /* done */`
		`+ if (!dnf_state_done (job_data->state, &error)) {`
		`+ pk_backend_job_error_code (job, error->code, "%s", error->message);`
		`+ --`
		`+ 2.24.1`
		`+`

PackageKit.spec

file modified

+7 -1

		`@@ -14,7 +14,7 @@`
		`Summary: Package management service`
		`Name: PackageKit`
		`Version: 1.1.12`
		`- Release: 6%{?dist}`
		`+ Release: 7%{?dist}`
		`License: GPLv2+ and LGPLv2+`
		`URL: http://www.freedesktop.org/software/PackageKit/`
		`Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz`
		`@@ -40,6 +40,9 @@`
		`# https://github.com/hughsie/PackageKit/pull/350`
		`Patch3: 0001-dnf-Reset-libgit2-module-when-upgrading-to-F31.patch`

		`+ # https://bugzilla.redhat.com/show_bug.cgi?id=1767351`
		`+ Patch4: 0001-Reset-all-module-streams-on-upgrade-to-Fedora-32.patch`
		`+`
		`BuildRequires: glib2-devel >= %{glib2_version}`
		`BuildRequires: xmlto`
		`BuildRequires: gtk-doc`
		`@@ -350,6 +353,9 @@`
		`%{_datadir}/vala/vapi/packagekit-glib2.vapi`

		`%changelog`
		`+ * Thu Mar 12 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.1.12-7`
		`+ - Reset all module streams when upgrading to Fedora 32 (#1804564)`
		`+`
		`* Thu Oct 24 2019 Kalev Lember <klember@redhat.com> - 1.1.12-6`
		`- Reset libgit2 module stream on upgrades to F31 (#1762751)`