Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2020-06-08 23:47:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit" Mon Jun 8 23:47:29 2020 rev:201 rq:811416 version:1.1.13 Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2020-04-29 20:42:32.211666813 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit.new.3606/PackageKit.changes 2020-06-08 23:48:12.266136714 +0200 @@ -1,0 +2,7 @@ +Tue May 26 02:37:45 UTC 2020 - Jonathan Kang <[email protected]> + +- Add PackageKit-zypp-ensure-ResPool-before-is_tumbleweed.patch: + zypp: Ensure ResPool is built before is_tumbleweed() + (gh#/hughsie/PackageKit/commit/5c0fd7d7). + +------------------------------------------------------------------- New: ---- PackageKit-zypp-ensure-ResPool-before-is_tumbleweed.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.FddHIX/_old 2020-06-08 23:48:14.446143439 +0200 +++ /var/tmp/diff_new_pack.FddHIX/_new 2020-06-08 23:48:14.450143451 +0200 @@ -59,6 +59,8 @@ Patch4: PackageKit-zypp-update-packages-in-all-openSUSE.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-UPSTREAM PackageKit-zypp-ensure-ResPool-before-is_tumbleweed.patch gh#/hughsie/PackageKit/commit/5c0fd7d7 [email protected] -- zypp: Ensure ResPool is built before is_tumbleweed(). +Patch6: PackageKit-zypp-ensure-ResPool-before-is_tumbleweed.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-ensure-ResPool-before-is_tumbleweed.patch ++++++ Index: PackageKit-1.1.13/backends/zypp/pk-backend-zypp.cpp =================================================================== --- PackageKit-1.1.13.orig/backends/zypp/pk-backend-zypp.cpp +++ PackageKit-1.1.13/backends/zypp/pk-backend-zypp.cpp @@ -3422,7 +3422,6 @@ upgrade_system (PkBackendJob *job, if (!zypp_refresh_cache (job, zypp, FALSE)) { return; } - zypp_build_pool (zypp, TRUE); zypp_get_updates (job, zypp, candidates); if (candidates.empty ()) { pk_backend_job_error_code (job, PK_ERROR_ENUM_NO_DISTRO_UPGRADE_DATA, @@ -3434,8 +3433,6 @@ upgrade_system (PkBackendJob *job, zypp->resolver ()->dupSetAllowVendorChange (ZConfig::instance ().solver_dupAllowVendorChange ()); zypp->resolver ()->doUpgrade (); - PoolStatusSaver saver; - zypp_perform_execution (job, zypp, UPGRADE_SYSTEM, FALSE, transaction_flags); zypp->resolver ()->setUpgradeMode (FALSE); @@ -3458,16 +3455,15 @@ backend_update_packages_thread (PkBacken return; } + ResPool pool = zypp_build_pool (zypp, TRUE); + PkRestartEnum restart = PK_RESTART_ENUM_NONE; + PoolStatusSaver saver; + if (is_tumbleweed ()) { upgrade_system (job, zypp, transaction_flags); return; } - ResPool pool = zypp_build_pool (zypp, TRUE); - PkRestartEnum restart = PK_RESTART_ENUM_NONE; - - PoolStatusSaver saver; - for (guint i = 0; package_ids[i]; i++) { sat::Solvable solvable = zypp_get_package_by_id (package_ids[i]);
