Hello community,

here is the log from the commit of package PackageKit for openSUSE:Factory 
checked in at 2020-03-16 10:15:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/PackageKit (Old)
 and      /work/SRC/openSUSE:Factory/.PackageKit.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "PackageKit"

Mon Mar 16 10:15:56 2020 rev:199 rq:784412 version:1.1.13

Changes:
--------
--- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes    2020-03-11 
18:32:50.690917020 +0100
+++ /work/SRC/openSUSE:Factory/.PackageKit.new.3160/PackageKit.changes  
2020-03-16 10:16:24.975540262 +0100
@@ -1,0 +2,13 @@
+Thu Mar 12 01:47:44 UTC 2020 - Jonathan Kang <[email protected]>
+
+- Add PackageKit-zypp-ignore-already-installed-packages.patch,
+  remove PackageKit-zypp-revert-fail-on-already-installed.patch:
+  zypp: Ignore already installed package when installing
+  (bsc#1155624, gh#/hughsie/PackageKit/commit/d9233011).
+
+-------------------------------------------------------------------
+Tue Mar 10 03:04:40 UTC 2020 - Jonathan Kang <[email protected]>
+
+- Fix source URL in the spec file.
+
+-------------------------------------------------------------------

Old:
----
  PackageKit-zypp-revert-fail-on-already-installed.patch

New:
----
  PackageKit-zypp-ignore-already-installed-packages.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ PackageKit.spec ++++++
--- /var/tmp/diff_new_pack.KWYAaV/_old  2020-03-16 10:16:25.987540675 +0100
+++ /var/tmp/diff_new_pack.KWYAaV/_new  2020-03-16 10:16:25.991540676 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package PackageKit
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -42,7 +42,7 @@
 Summary:        Simple software installation management software
 License:        GPL-2.0-or-later
 Group:          System/Daemons
-URL:            https://www.freedesktop.org/software/PackageKit/
+URL:            https://www.freedesktop.org/software/PackageKit
 Source0:        %{url}/releases/%{name}-%{version}.tar.xz
 Source1:        %{url}/releases/%{name}-%{version}.tar.xz.asc
 Source2:        baselibs.conf
@@ -57,8 +57,8 @@
 Patch3:         PackageKit-drop-gtk2.patch
 # PATCH-FIX-UPSTREAM PackageKit-zypp-update-packages-in-all-openSUSE.patch 
[email protected] -- Handle Tumbleweed upgrade in update-packages as well so that 
it doesn't break other components.
 Patch4:         PackageKit-zypp-update-packages-in-all-openSUSE.patch
-# PATCH-FIX-OPENSUSE PackageKit-zypp-revert-fail-on-already-installed.patch 
boo#1155624 [email protected] -- Stop PK from erroring on already installed 
files
-Patch5:         PackageKit-zypp-revert-fail-on-already-installed.patch
+# PATCH-FIX-UPSTREAM PackageKit-zypp-ignore-already-installed-packages.patch 
bsc#1155624, gh#/hughsie/PackageKit/commit/d9233011 [email protected] -- 
zypp: Ignore already installed package when installing.
+Patch5:         PackageKit-zypp-ignore-already-installed-packages.patch
 # PATCH-FIX-OPENSUSE PackageKit-dnf-Add-openSUSE-vendor.patch 
[email protected] -- Add openSUSE vendor
 Patch1001:      PackageKit-dnf-Add-openSUSE-vendor.patch
 # PATCH-FIX-OPENSUSE 
PackageKit-dnf-Add-support-for-AppStream-repodata-basenames-use.patch 
[email protected] -- Band-aid to deal with OBS producing differently named 
appstream repodata files


++++++ PackageKit-zypp-ignore-already-installed-packages.patch ++++++
>From d9233011cbc7b69f5318ae2c2e03712e11e3dea0 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <[email protected]>
Date: Wed, 11 Mar 2020 09:37:19 +0800
Subject: [PATCH] zypp: Ignore already installed package when installing

Previously, when users are installing multiple packages at the same
time using "pkcon install", if one/some of those packages is/are already
installed, the whole installing process terminates, withouting
installing those uninstalled packages.

Fix that by ignoring those already installed pacakge and proceeding to
install those which are not yet installed.
---
 backends/zypp/pk-backend-zypp.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/backends/zypp/pk-backend-zypp.cpp 
b/backends/zypp/pk-backend-zypp.cpp
index 9aa24741c..62b78ec0c 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -2785,12 +2785,7 @@ backend_install_packages_thread (PkBackendJob *job, 
GVariant *params, gpointer u
                        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;
+                               continue;
                        }
 
                        if (relations[i] == OLDER_VERSION &&
-- 
2.24.0



Reply via email to