Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2019-10-17 13:05:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit" Thu Oct 17 13:05:55 2019 rev:192 rq:738470 version:1.1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2019-09-11 10:18:17.487526412 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit.new.2352/PackageKit.changes 2019-10-17 13:05:56.880288924 +0200 @@ -1,0 +2,15 @@ +Mon Oct 14 07:00:32 UTC 2019 - Jonathan Kang <sck...@suse.com> + +- Remove zypp-Switch-to-doUpgrade-solver-when-required-by-distribution.patch, + rebase zypp-perform-actions-disallowed-by-update-in-upgrade-mode.patch, + add PackageKit-zypp-dont-set-upgrade-mode-on-updating-specific-packages.patch: + zypp: Don't set upgrade mode in update-packages + (gh#hughsie/PackageKit#345). + +------------------------------------------------------------------- +Wed Oct 9 06:19:11 UTC 2019 - Jonathan Kang <sck...@suse.com> + +- Add PackageKit-zypp-get-updates-dup-or-up.patch: Fix get-updates + in Tumbleweed(gh#hughsie/PackageKit#343). + +------------------------------------------------------------------- Old: ---- zypp-Switch-to-doUpgrade-solver-when-required-by-distribution.patch New: ---- PackageKit-zypp-dont-set-upgrade-mode-on-updating-specific-packages.patch PackageKit-zypp-get-updates-dup-or-up.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.Ma0Y6D/_old 2019-10-17 13:05:57.916286256 +0200 +++ /var/tmp/diff_new_pack.Ma0Y6D/_new 2019-10-17 13:05:57.920286246 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -47,16 +47,19 @@ Patch2: PackageKit-add-mutex-lock-to-protect-backend-priv-eulas.patch # PATCH-FEATURE-OPENSUSE PackageKit-systemd-timers.patch bsc#1115410 sck...@suse.com -- Migrate from cron to systemd timers Patch3: PackageKit-systemd-timers.patch -Patch4: zypp-Switch-to-doUpgrade-solver-when-required-by-distribution.patch # PATCH-FIX-OPENSUSE PackageKit-remove-polkit-rules.patch bsc#1125434 sck...@suse.com -- Remove polkit rules file -Patch5: PackageKit-remove-polkit-rules.patch -Patch6: zypp-perform-actions-disallowed-by-update-in-upgrade-mode.patch +Patch4: PackageKit-remove-polkit-rules.patch # PATCH-FIX-UPSTREAM PackageKit-zypp-fix-newest-filter.patch bsc#1137019 gh#hughsie/PackageKit#329 sck...@suse.com -- zypp: Emit installed package for newest filter -Patch7: PackageKit-zypp-fix-newest-filter.patch +Patch5: PackageKit-zypp-fix-newest-filter.patch # PATCH-FIX-UPSTREAM PackageKit-zypp-fix-what-provides-newest-filter.patch bsc#984865, gh#hughsie/PackageKit#335 sck...@suse.com -- zypp: Add support for newest filter in what-provides -Patch8: PackageKit-zypp-fix-what-provides-newest-filter.patch +Patch6: PackageKit-zypp-fix-what-provides-newest-filter.patch # PATCH-FIX-UPSTREAM PackageKit-drop-gtk2.patch gh#/hughsie/PackageKit#333 - Port away from gtk2 dependency -Patch9: PackageKit-drop-gtk2.patch +Patch7: PackageKit-drop-gtk2.patch +# PATCH-FIX-UPSTREAM PackageKit-zypp-get-updates-dup-or-up.patch gh#hughsie/PackageKit#343 sck...@suse.com -- zypp: Fix get-updates in Tumbleweed +Patch8: PackageKit-zypp-get-updates-dup-or-up.patch +# PATCH-FIX-UPSTREAM PackageKit-zypp-dont-set-upgrade-mode-on-updating-specific-packages.patch gh#hughsie/PackageKit#345 sck...@suse.com -- zypp: Don't set upgrade mode in update-packages +Patch9: PackageKit-zypp-dont-set-upgrade-mode-on-updating-specific-packages.patch +Patch10: zypp-perform-actions-disallowed-by-update-in-upgrade-mode.patch BuildRequires: autoconf-archive BuildRequires: fdupes ++++++ PackageKit-zypp-dont-set-upgrade-mode-on-updating-specific-packages.patch ++++++ >From 44a2887864b7c0ac54d342126069b6a7ff3c5822 Mon Sep 17 00:00:00 2001 From: Jonathan Kang <jonathank...@gnome.org> Date: Mon, 14 Oct 2019 15:17:34 +0800 Subject: [PATCH] zypp: Don't set upgrade mode in update-packages update-packages does two things: 1. update the whole system. 2. update specific packages. setting upgrade mode to TRUE in update-packages can lead to inability to update specific packages, as the resolver always trys to upgrade the whole system in upgrade mode. Since calling "pkcon update" in Tumbleweed invokes get-updates where upgrade mode is set to TRUE, we don't have to set it in update-packages anymore. Besides, we should reset upgrade mode to FALSE at the end of update-packages to make sure not to block further actions. --- backends/zypp/pk-backend-zypp.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 4885df6f5..fbaf5413e 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -3391,6 +3391,8 @@ backend_update_packages_thread (PkBackendJob *job, GVariant *params, gpointer us } zypp_perform_execution (job, zypp, UPDATE, FALSE, transaction_flags); + + zypp->resolver()->setUpgradeMode(FALSE); } /** -- 2.21.0 ++++++ PackageKit-zypp-get-updates-dup-or-up.patch ++++++ >From fcb9cf74abc56b109d0f71d538f4ac53a996a0bb Mon Sep 17 00:00:00 2001 From: Jonathan Kang <jonathank...@gnome.org> Date: Wed, 25 Sep 2019 14:49:11 +0800 Subject: [PATCH] respect system wide settings when getting updates --- backends/zypp/pk-backend-zypp.cpp | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 8b09fb13a..460483f54 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -1192,7 +1192,25 @@ zypp_emit_filtered_packages_in_list (PkBackendJob *job, PkBitfield filters, cons } } +static gboolean +is_tumbleweed (void) +{ + gboolean ret = FALSE; + static const Capability cap( "product-update()", Rel::EQ, "dup" ); + ui::Selectable::Ptr sel (ui::Selectable::get (ResKind::package, "openSUSE-release")); + if (sel) { + if (!sel->installedEmpty ()) { + for_ (it, sel->installedBegin (), sel->installedEnd ()) { + if (it->satSolvable ().provides ().matches (cap)) { + ret = TRUE; + break; + } + } + } + } + return ret; +} /** * Returns a set of all packages the could be updated @@ -1201,13 +1219,21 @@ zypp_emit_filtered_packages_in_list (PkBackendJob *job, PkBitfield filters, cons static void zypp_get_package_updates (string repo, set<PoolItem> &pks) { + ZYpp::Ptr zypp = getZYpp (); + zypp::Resolver_Ptr resolver = zypp->resolver (); ResPool pool = ResPool::instance (); ResObject::Kind kind = ResTraits<Package>::kind; ResPool::byKind_iterator it = pool.byKindBegin (kind); ResPool::byKind_iterator e = pool.byKindEnd (kind); - getZYpp()->resolver()->doUpdate(); + if (is_tumbleweed ()) { + resolver->dupSetAllowVendorChange (ZConfig::instance ().solver_dupAllowVendorChange ()); + resolver->doUpgrade (); + } else { + resolver->doUpdate (); + } + for (; it != e; ++it) if (it->status().isToBeInstalled()) { ui::Selectable::constPtr s = -- 2.21.0 ++++++ zypp-perform-actions-disallowed-by-update-in-upgrade-mode.patch ++++++ --- /var/tmp/diff_new_pack.Ma0Y6D/_old 2019-10-17 13:05:57.988286071 +0200 +++ /var/tmp/diff_new_pack.Ma0Y6D/_new 2019-10-17 13:05:57.988286071 +0200 @@ -11,7 +11,7 @@ =================================================================== --- PackageKit-1.1.12.orig/backends/zypp/pk-backend-zypp.cpp +++ PackageKit-1.1.12/backends/zypp/pk-backend-zypp.cpp -@@ -1470,7 +1470,7 @@ zypp_perform_execution (PkBackendJob *jo +@@ -1509,7 +1509,7 @@ zypp_perform_execution (PkBackendJob *jo case INSTALL: case UPDATE: // for updates we only care for updates @@ -20,18 +20,18 @@ continue; break; } -@@ -3305,6 +3305,10 @@ backend_update_packages_thread (PkBacken - } +@@ -3347,6 +3347,10 @@ backend_update_packages_thread (PkBacken } - + ResPool pool = zypp_build_pool (zypp, TRUE); + PkRestartEnum restart = PK_RESTART_ENUM_NONE; ++ + 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 (PkBacken +@@ -3366,12 +3370,12 @@ backend_update_packages_thread (PkBacken // 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;
