File PackageKit-zypp-revert-fail-on-already-installe... of Package PackageKit

Overview Repositories Revisions Requests Users Attributes Meta

File PackageKit-zypp-revert-fail-on-already-installed.patch of Package PackageKit (Revision fb5061cf9b6a7e8a81ad83bcf1016e73)

Currently displaying revision fb5061cf9b6a7e8a81ad83bcf1016e73 , Show latest

From 4860f9e886d339c1e540fb6443c88fd5771f170f Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Sat, 7 Mar 2020 10:29:57 -0500
Subject: [PATCH] Revert "zypp: Promt users when installing already installed
 packages"

This causes PackageKit to fail in scenarios that users expect it to
succeed.

Reference: https://bugzilla.opensuse.org/show_bug.cgi?id=1155624

This reverts commit c45e0f22df682ebdfdfe317a703a59cd2cd53a60.
---
 backends/zypp/pk-backend-zypp.cpp | 83 +++----------------------------
 1 file changed, 6 insertions(+), 77 deletions(-)

diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index e8d2348d5..aa53b395d 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -104,11 +104,6 @@ typedef enum {
         UPGRADE_SYSTEM
 } PerformType;
 
-typedef enum {
-        NEWER_VERSION,
-        OLDER_VERSION,
-        EQUAL_VERSION
-} VersionRelation;
 
 class ZyppJob {
  public:
@@ -2710,7 +2705,7 @@ backend_install_packages_thread (PkBackendJob *job, GVariant *params, gpointer u
 
 	PkBitfield transaction_flags = 0;
 	gchar **package_ids;
-
+	
 	g_variant_get(params, "(t^a&s)",
 		      &transaction_flags,
 		      &package_ids);
@@ -2728,24 +2723,18 @@ backend_install_packages_thread (PkBackendJob *job, GVariant *params, gpointer u
 
 	pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY);
 	pk_backend_job_set_percentage (job, 0);
-
+	
 	try
 	{
 		ResPool pool = zypp_build_pool (zypp, TRUE);
 		PoolStatusSaver saver;
 		pk_backend_job_set_percentage (job, 10);
 		vector<PoolItem> items;
-		VersionRelation relations[g_strv_length (package_ids)];
-		guint to_install = 0;
 
+		guint to_install = 0;
 		for (guint i = 0; package_ids[i]; i++) {
 			MIL << package_ids[i] << endl;
-			g_auto(GStrv) split = NULL;
-			gint ret;
 			sat::Solvable solvable = zypp_get_package_by_id (package_ids[i]);
-			sat::Solvable *inst_pkg = NULL;
-			sat::Solvable *latest_pkg = NULL;
-			vector<sat::Solvable> installed;
 
 			if (zypp_is_no_solvable(solvable)) {
 				// Previously stored package_id no longer matches any solvable.
@@ -2753,75 +2742,15 @@ backend_install_packages_thread (PkBackendJob *job, GVariant *params, gpointer u
 							     "couldn't find package");
 				return;
 			}
-
-			split = pk_package_id_split (package_ids[i]);
-			ui::Selectable::Ptr sel (ui::Selectable::get (ResKind::package,
-								      split[PK_PACKAGE_ID_NAME]));
-			if (sel && !sel->installedEmpty ()) {
-				for_ (it, sel->installedBegin (), sel->installedEnd ()) {
-					if (it->satSolvable ().arch ().compare (Arch (split[PK_PACKAGE_ID_ARCH])) == 0) {
-						installed.push_back ((it->satSolvable ()));
-					}
-				}
-			}
-
-			for (guint j = 0; j < installed.size (); j++) {
-				inst_pkg = &installed.at (j);
-				ret = inst_pkg->edition ().compare (Edition (split[PK_PACKAGE_ID_VERSION]));
-
-				if (relations[i] == 0 && ret < 0) {
-					relations[i] = NEWER_VERSION;
-				} else if (relations[i] != EQUAL_VERSION && ret > 0) {
-					relations[i] = OLDER_VERSION;
-					if (!latest_pkg ||
-					    latest_pkg->edition ().compare (inst_pkg->edition ()) < 0) {
-						latest_pkg = inst_pkg;
-					}
-				} else if (ret == 0) {
-					relations[i] = EQUAL_VERSION;
-					break;
-				}
-			}
-
-			if (relations[i] == EQUAL_VERSION &&
-			    !pk_bitfield_contain (transaction_flags,
-						  PK_TRANSACTION_FLAG_ENUM_ALLOW_REINSTALL)) {
-				g_autofree gchar *printable_tmp = pk_package_id_to_printable (package_ids[i]);
-				pk_backend_job_error_code (job,
-							   PK_ERROR_ENUM_PACKAGE_ALREADY_INSTALLED,
-							   "%s is already installed",
-							   printable_tmp);
-				return;
-			}
-
-			if (relations[i] == OLDER_VERSION &&
-			    !pk_bitfield_contain (transaction_flags,
-						  PK_TRANSACTION_FLAG_ENUM_ALLOW_DOWNGRADE)) {
-				pk_backend_job_error_code (job,
-							   PK_ERROR_ENUM_PACKAGE_ALREADY_INSTALLED,
-							   "higher version \"%s\" of package %s.%s is already installed",
-							   latest_pkg->edition ().version ().c_str (),
-							   split[PK_PACKAGE_ID_NAME],
-							   split[PK_PACKAGE_ID_ARCH]);
-				return;
-			}
-
-			if (relations[i] && relations[i] != EQUAL_VERSION &&
-			    pk_bitfield_contain (transaction_flags,
-						 PK_TRANSACTION_FLAG_ENUM_JUST_REINSTALL)) {
-				pk_backend_job_error_code (job,
-							   PK_ERROR_ENUM_NOT_AUTHORIZED,
-							   "missing authorization to update or downgrade software");
-				return;
-			}
-
+			
 			to_install++;
 			PoolItem item(solvable);
 			// set status to ToBeInstalled
 			item.status ().setToBeInstalled (ResStatus::USER);
 			items.push_back (item);
+		
 		}
-
+			
 		pk_backend_job_set_percentage (job, 40);
 
 		if (!to_install) {
-- 
2.24.1

Places

File PackageKit-zypp-revert-fail-on-already-installed.patch of Package PackageKit (Revision fb5061cf9b6a7e8a81ad83bcf1016e73)

Places