Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2019-05-10 09:15:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit" Fri May 10 09:15:25 2019 rev:187 rq:701598 version:1.1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2019-03-26 15:37:31.144369988 +0100 +++ /work/SRC/openSUSE:Factory/.PackageKit.new.5148/PackageKit.changes 2019-05-10 09:15:28.700007995 +0200 @@ -1,0 +2,6 @@ +Tue Apr 23 15:39:37 UTC 2019 - Stasiek Michalski <[email protected]> + +- Add zypp-perform-actions-disallowed-by-update-in-upgrade-mode.patch + to fix switch to upgrade mode in the backend + +------------------------------------------------------------------- New: ---- zypp-perform-actions-disallowed-by-update-in-upgrade-mode.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.eEqZZl/_old 2019-05-10 09:15:29.336009811 +0200 +++ /var/tmp/diff_new_pack.eEqZZl/_new 2019-05-10 09:15:29.340009822 +0200 @@ -50,6 +50,7 @@ Patch4: zypp-Switch-to-doUpgrade-solver-when-required-by-distribution.patch # PATCH-FIX-OPENSUSE PackageKit-remove-polkit-rules.patch bsc#1125434 [email protected] -- Remove polkit rules file Patch5: PackageKit-remove-polkit-rules.patch +Patch6: zypp-perform-actions-disallowed-by-update-in-upgrade-mode.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel @@ -239,6 +240,7 @@ %endif %patch4 -p1 %patch5 -p1 +%patch6 -p1 translation-update-upstream %build ++++++ zypp-perform-actions-disallowed-by-update-in-upgrade-mode.patch ++++++ >From 8db2a405634b0a98c78a8a1e0ebf339643a645b2 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski <[email protected]> Date: Thu, 14 Mar 2019 19:48:13 +0100 Subject: [PATCH] [zypp] Perform actions disallowed by update in upgrade mode --- backends/zypp/pk-backend-zypp.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index b607d5632..13a5c5db1 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -1470,7 +1470,7 @@ zypp_perform_execution (PkBackendJob *job, ZYpp::Ptr zypp, PerformType type, gbo case INSTALL: case UPDATE: // for updates we only care for updates - if (it->status ().isToBeUninstalledDueToUpgrade ()) + if (it->status ().isToBeUninstalledDueToUpgrade () && !zypp->resolver()->upgradeMode()) continue; break; } @@ -3305,6 +3305,10 @@ backend_update_packages_thread (PkBackendJob *job, GVariant *params, gpointer us } } + if ( zypp->resolver()->upgradeMode() ) { + zypp->resolver()->dupSetAllowVendorChange ( ZConfig::instance().solver_dupAllowVendorChange() ); + } + PoolStatusSaver saver; for (guint i = 0; package_ids[i]; i++) { @@ -3323,12 +3327,12 @@ backend_update_packages_thread (PkBackendJob *job, GVariant *params, gpointer us // patches are special - they are not installed and can't have update candidates if (sel->kind() != ResKind::patch) { MIL << "sel " << sel->kind() << " " << sel->ident() << endl; - if (sel->installedEmpty()) { + if (sel->installedEmpty() && !zypp->resolver()->upgradeMode()) { zypp_backend_finished_error (job, PK_ERROR_ENUM_DEP_RESOLUTION_FAILED, "Package %s is not installed", package_ids[i]); return; } item = sel->updateCandidateObj(); - if (!item) { + if (!item && !zypp->resolver()->upgradeMode()) { zypp_backend_finished_error(job, PK_ERROR_ENUM_DEP_RESOLUTION_FAILED, "There is no update candidate for %s", sel->installedObj().satSolvable().asString().c_str()); return; }
