File PackageKit-zypp-fix-newest-filter.patch of Package PackageKit

Overview Repositories Revisions Requests Users Attributes Meta

File PackageKit-zypp-fix-newest-filter.patch of Package PackageKit (Revision b8ae90f3122e7ff9b34c2b686d1e6e51)

Currently displaying revision b8ae90f3122e7ff9b34c2b686d1e6e51 , Show latest

From 1c497c904959978229899ead80e7e94be73a6e15 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathankang@gnome.org>
Date: Wed, 19 Jun 2019 16:07:31 +0800
Subject: [PATCH] zypp: Emit installed package for newest filter

Previously, zypp backend only emit newest package in
backend_resolve_thread(). The newest filter processes installed
and available package lists separately, so the installed package should
be emitted as well.

https://bugzilla.suse.com/show_bug.cgi?id=1137019
---
 backends/zypp/pk-backend-zypp.cpp | 32 +++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index 13a5c5db1..a8d50593b 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -2895,6 +2895,7 @@ backend_resolve_thread (PkBackendJob *job, GVariant *params, gpointer user_data)
 		zypp_get_packages_by_name (search[i], ResKind::pattern, v2);
 		v.insert (v.end (), v2.begin (), v2.end ());
 
+		sat::Solvable installed;
 		sat::Solvable newest;
 		vector<sat::Solvable> pkgs;
 
@@ -2906,7 +2907,11 @@ backend_resolve_thread (PkBackendJob *job, GVariant *params, gpointer user_data)
 			if (zypp_filter_solvable (_filters, *it) ||
 			    zypp_is_no_solvable(*it))
 				continue;
-			
+
+			if (it->isSystem ()) {
+				installed = *it;
+			}
+
 			if (zypp_is_no_solvable(newest)) {
 				newest = *it;
 			} else if (it->edition() > newest.edition() || Arch::compare(it->arch(), newest.arch()) > 0) {
@@ -2915,19 +2920,26 @@ backend_resolve_thread (PkBackendJob *job, GVariant *params, gpointer user_data)
 			MIL << "emit " << *it << endl;
 			pkgs.push_back (*it);
 		}
-		
-		if (!zypp_is_no_solvable(newest)) {
-			
-			/* 'newest' filter support */
-			if (pk_bitfield_contain (_filters, PK_FILTER_ENUM_NEWEST)) {
-				pkgs.clear();
-				MIL << "emit just newest " << newest << endl;
+
+		/* The newest filter processes installed and available package
+		 * lists separately. */
+		if (pk_bitfield_contain (_filters, PK_FILTER_ENUM_NEWEST)) {
+			pkgs.clear ();
+
+			if (!zypp_is_no_solvable (installed)) {
+				MIL << "emit installed " << installed << endl;
+				pkgs.push_back (installed);
+			}
+			if (!zypp_is_no_solvable (newest)) {
+				MIL << "emit newest " << newest << endl;
 				pkgs.push_back (newest);
-			} else if (pk_bitfield_contain (_filters, PK_FILTER_ENUM_NOT_NEWEST)) {
+			}
+		} else if (pk_bitfield_contain (_filters, PK_FILTER_ENUM_NOT_NEWEST)) {
+			if (!zypp_is_no_solvable (newest) && newest != installed) {
 				pkgs.erase (find (pkgs.begin (), pkgs.end(), newest));
 			}
 		}
-		
+
 		zypp_emit_filtered_packages_in_list (job, _filters, pkgs);
 	}
 }
-- 
2.21.0

Places

File PackageKit-zypp-fix-newest-filter.patch of Package PackageKit (Revision b8ae90f3122e7ff9b34c2b686d1e6e51)

Places