Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package PackageKit for openSUSE:Factory
checked in at 2021-02-16 22:35:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/PackageKit (Old)
and /work/SRC/openSUSE:Factory/.PackageKit.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit"
Tue Feb 16 22:35:28 2021 rev:214 rq:870844 version:1.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2021-01-30
13:28:56.067706945 +0100
+++ /work/SRC/openSUSE:Factory/.PackageKit.new.28504/PackageKit.changes
2021-02-16 22:37:12.765715594 +0100
@@ -7,0 +8,6 @@
+Fri Jan 29 21:30:49 UTC 2021 - Neal Gompa <ngomp...@gmail.com>
+
+- Backport fix from upstream to have DNF backend force dup for updates
+ + Patch: PackageKit-dnf-Add-support-for-coercing-upgrade-to-distupgrade.patch
+
+-------------------------------------------------------------------
New:
----
PackageKit-dnf-Add-support-for-coercing-upgrade-to-distupgrade.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ PackageKit.spec ++++++
--- /var/tmp/diff_new_pack.8PMpHs/_old 2021-02-16 22:37:14.469717864 +0100
+++ /var/tmp/diff_new_pack.8PMpHs/_new 2021-02-16 22:37:14.473717869 +0100
@@ -56,6 +56,8 @@
Patch5: PackageKit-fix-crash-pre-dbus.patch
# PATCH-FIX-UPSTREAM PackageKit-zypp-reset-update-mode-after-get-updates.patch
gh#hughsie/PackageKit/commit#b208f551 bsc#1180150 sck...@suse.com -- zypp:
Reset update mode after getting updates
Patch6: PackageKit-zypp-reset-update-mode-after-get-updates.patch
+# PATCH-FIX-UPSTREAM
PackageKit-dnf-Add-support-for-coercing-upgrade-to-distupgrade.patch
gh#hughsie/PackageKit#449 -- Use dup for upgrades on Tumbleweed with DNF
+Patch7:
PackageKit-dnf-Add-support-for-coercing-upgrade-to-distupgrade.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
++++++ PackageKit-dnf-Add-support-for-coercing-upgrade-to-distupgrade.patch
++++++
>From 7d89261b61b8536531ef2ae85c0c631d8c97f723 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngomp...@gmail.com>
Date: Fri, 29 Jan 2021 13:41:06 -0500
Subject: [PATCH] dnf: Add support for coercing upgrade to distupgrade
Some distributions (particularly rolling release distributions)
prefer that normal "upgrade" actions actually trigger the distupgrade
method in the package manager. This change enables that if the
installed distribution release package specifies that this
behavior must occur.
---
backends/dnf/pk-backend-dnf.c | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/backends/dnf/pk-backend-dnf.c b/backends/dnf/pk-backend-dnf.c
index 74d35c34c..05f354afe 100644
--- a/backends/dnf/pk-backend-dnf.c
+++ b/backends/dnf/pk-backend-dnf.c
@@ -823,6 +823,28 @@ dnf_utils_run_query_with_newest_filter (DnfSack *sack,
HyQuery query)
return results;
}
+static gboolean
+dnf_utils_force_distupgrade_on_upgrade (DnfSack *sack)
+{
+ g_autoptr(GPtrArray) plist = NULL;
+ gint candidates;
+ const gchar *distroverpkg_names[] = { "system-release",
"distribution-release", NULL };
+ const gchar *distupgrade_provides[] = { "system-upgrade(dsync)",
"product-upgrade() = dup", NULL };
+ HyQuery query_tmp = hy_query_create (sack);
+
+ hy_query_filter (query_tmp, HY_PKG_REPONAME, HY_EQ,
HY_SYSTEM_REPO_NAME);
+ hy_query_filter_provides_in (query_tmp, (gchar**) distroverpkg_names);
+ hy_query_filter_provides_in (query_tmp, (gchar**) distupgrade_provides);
+
+ plist = hy_query_run (query_tmp);
+ candidates = plist->len;
+ hy_query_free (query_tmp);
+
+ if (candidates > 0)
+ return TRUE;
+ return FALSE;
+}
+
static GPtrArray *
dnf_utils_run_query_with_filters (PkBackendJob *job, DnfSack *sack,
HyQuery query, PkBitfield filters)
@@ -1001,7 +1023,11 @@ pk_backend_search_thread (PkBackendJob *job, GVariant
*params, gpointer user_dat
dnf_sack_set_installonly_limit (sack,
dnf_context_get_installonly_limit (job_data->context));
job_data->goal = hy_goal_create (sack);
- hy_goal_upgrade_all (job_data->goal);
+ if (dnf_utils_force_distupgrade_on_upgrade (sack)) {
+ hy_goal_distupgrade_all (job_data->goal);
+ } else {
+ hy_goal_upgrade_all (job_data->goal);
+ }
ret = dnf_goal_depsolve (job_data->goal, DNF_ALLOW_UNINSTALL,
&error);
if (!ret) {
pk_backend_job_error_code (job, error->code, "%s",
error->message);
--
2.29.2
