pool/PackageKit
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 808875 from home:JonathanKang:branches:GNOME:Factory

Browse Source 
- Add PackageKit-zypp-ensure-ResPool-before-is_tumbleweed.patch:
  zypp: Ensure ResPool is built before is_tumbleweed()
  (gh#/hughsie/PackageKit/commit/5c0fd7d7).

OBS-URL: https://build.opensuse.org/request/show/808875
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/PackageKit?expand=0&rev=380
This commit is contained in:
Dominique Leuenberger 2020-06-04 11:44:17 +00:00 committed by Git OBS Bridge
parent b50fc6023a
commit 88355e8c53
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
PackageKit-zypp-ensure-ResPool-before-is_tumbleweed.patch Normal file
View File

@ -0,0 +1,42 @@
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]);

7
PackageKit.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 26 02:37:45 UTC 2020 - Jonathan Kang <songchuan.kang@suse.com>
- Add PackageKit-zypp-ensure-ResPool-before-is_tumbleweed.patch:
zypp: Ensure ResPool is built before is_tumbleweed()
(gh#/hughsie/PackageKit/commit/5c0fd7d7).
-------------------------------------------------------------------
Wed Apr 22 02:54:02 UTC 2020 - Jonathan Kang <songchuan.kang@suse.com>

2
PackageKit.spec
View File

@ -59,6 +59,8 @@ Patch3: PackageKit-drop-gtk2.patch
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 songchuan.kang@suse.com -- 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 sckang@suse.com -- 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 ngompa13@gmail.com -- Add openSUSE vendor
Patch1001: PackageKit-dnf-Add-openSUSE-vendor.patch
# PATCH-FIX-OPENSUSE PackageKit-dnf-Add-support-for-AppStream-repodata-basenames-use.patch ngompa13@gmail.com -- Band-aid to deal with OBS producing differently named appstream repodata files