Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package PackageKit for openSUSE:Factory
checked in at 2022-10-03 13:44:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/PackageKit (Old)
and /work/SRC/openSUSE:Factory/.PackageKit.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit"
Mon Oct 3 13:44:23 2022 rev:231 rq:1007202 version:1.2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2022-09-03
23:18:38.955748151 +0200
+++ /work/SRC/openSUSE:Factory/.PackageKit.new.2275/PackageKit.changes
2022-10-03 13:44:34.365324449 +0200
@@ -1,0 +2,12 @@
+Mon Sep 26 03:12:44 UTC 2022 - Jonathan Kang <songchuan.k...@suse.com>
+
+- Add PackageKit-zypp-dont-remove-locked-packages.patch: zypp:
+ Check if packages are locked before removing
+ (gh#PackageKit/PackageKit/commit/8649a07bc, bsc#1199895).
+- Add PackageKit-zypp-add-repo-in-packageid.patch: zypp: add
+ repository data in package id
+ (gh#PackageKit/PackageKit/commit/8eb2ef0ae, bsc#1202585).
+- Remove PackageKit-zypp-locked-packages.patch: reverted upstream
+ (gh#PackageKit/PackageKit/commit/ed3e38043).
+
+-------------------------------------------------------------------
Old:
----
PackageKit-zypp-locked-packages.patch
New:
----
PackageKit-zypp-add-repo-in-packageid.patch
PackageKit-zypp-dont-remove-locked-packages.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ PackageKit.spec ++++++
--- /var/tmp/diff_new_pack.Mignkr/_old 2022-10-03 13:44:35.521326992 +0200
+++ /var/tmp/diff_new_pack.Mignkr/_new 2022-10-03 13:44:35.525327001 +0200
@@ -52,22 +52,24 @@
Patch3:
PackageKit-dnf-Add-support-for-AppStream-repodata-basenames-use.patch
# PATCH-FIX-UPSTREAM PackageKit-fix-crash-pre-dbus.patch
gh#hughsie/PackageKit!436 -- Do not crash when calling pk_dbus_get_uid() before
D-Bus is setup
Patch4: PackageKit-fix-crash-pre-dbus.patch
-# PATCH-FIX-UPSTREAM PackageKit-zypp-locked-packages.patch
gh#hughsie/PackageKit#543, boo#1199895 sck...@suse.com -- zypp: ignore locked
packages
-Patch5: PackageKit-zypp-locked-packages.patch
# PATCH-FIX-UPSTREAM PackageKit-zypp-add-upgrade-system.patch
gh#hughsie/PackageKit/commit/930dd201b sck...@suse.com -- zypp: implement
upgrade-system method
-Patch6: PackageKit-zypp-add-upgrade-system.patch
+Patch5: PackageKit-zypp-add-upgrade-system.patch
# PATCH-FIX-UPSTREAM PackageKit-zypp-avoid-statuReset.patch
gh#PackageKit/PackageKit/commit/dd1964255, bsc#1199895 sck...@suse.com -- zypp:
Avoid statuReset() on locked packages
-Patch7: PackageKit-zypp-avoid-statuReset.patch
+Patch6: PackageKit-zypp-avoid-statuReset.patch
# PATCH-FIX-UPSTREAM PackageKit-zypp-disable-upgrade-system-in-sle.patch
gh#PackageKit/PackageKit/commit/0fcd820c2 sck...@suse.com -- zypp: Disable
upgrade-system support in SLE
-Patch8: PackageKit-zypp-disable-upgrade-system-in-sle.patch
+Patch7: PackageKit-zypp-disable-upgrade-system-in-sle.patch
# PATCH-FIX-UPSTREAM
PackageKit-zypp-restore-pool-status-after-simulating-update.patch
gh#PackageKit/PackageKit/commit/2b61a6649, bsc#1199895 sck...@suse.com -- zypp:
restore pool status after simulating an update
-Patch9:
PackageKit-zypp-restore-pool-status-after-simulating-update.patch
+Patch8:
PackageKit-zypp-restore-pool-status-after-simulating-update.patch
# PATCH-FIX-UPSTREAM PackageKit-zypp-fix-is-tumbleweed-check.patch
gh#PackageKit/PackageKit/commit/146890153 sck...@suse.com -- zypp: build the
pool before calling is_tumbleweed()
-Patch10: PackageKit-zypp-fix-is-tumbleweed-check.patch
+Patch9: PackageKit-zypp-fix-is-tumbleweed-check.patch
# PATCH-FIX-UPSTREAM PackageKit-zypp-update-libzypp-dependency-version.patch
gh#PackageKit/PackageKit/commit/58c7c0285, bsc#1199895 sck...@suse.com -- zypp:
update libzypp dependency version
-Patch11: PackageKit-zypp-update-libzypp-dependency-version.patch
+Patch10: PackageKit-zypp-update-libzypp-dependency-version.patch
# PATCH-FIX-UPSTREAM PackageKit-zypp-dont-refresh-before-searching.patch
gh#PackageKit/PackageKit/commit/7e700e217, bsc#1202796 sck...@suse.com -- zypp:
Don't refresh repos before searching
-Patch12: PackageKit-zypp-dont-refresh-before-searching.patch
+Patch11: PackageKit-zypp-dont-refresh-before-searching.patch
+# PATCH-FIX-UPSTREAM PackageKit-zypp-dont-remove-locked-packages.patch
gh#PackageKit/PackageKit/commit/8649a07bc, bsc#1199895 sck...@suse.com -- zypp:
Check if packages are locked before removing
+Patch12: PackageKit-zypp-dont-remove-locked-packages.patch
+# PATCH-FIX-UPSTREAM PackageKit-zypp-fix-package-id.patch
gh#PackageKit/PackageKit/commit/8eb2ef0ae, bsc#1202585 sck...@suse.com -- zypp:
add repository data in package id
+Patch13: PackageKit-zypp-add-repo-in-packageid.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
++++++ PackageKit-zypp-add-repo-in-packageid.patch ++++++
Index: PackageKit-1.2.5/backends/zypp/pk-backend-zypp.cpp
===================================================================
--- PackageKit-1.2.5.orig/backends/zypp/pk-backend-zypp.cpp
+++ PackageKit-1.2.5/backends/zypp/pk-backend-zypp.cpp
@@ -169,18 +169,30 @@ zypp_build_package_id_from_resolvable (c
{
gchar *package_id;
const char *arch;
+ g_autofree gchar *repo = NULL;
if (isKind<SrcPackage>(resolvable))
arch = "source";
else
arch = resolvable.arch ().asString ().c_str ();
- string repo = resolvable.repository ().alias();
- if (resolvable.isSystem())
- repo = "installed";
+ if (resolvable.isSystem ()) {
+ PoolItem pi;
+ PoolItem installedPI { resolvable };
+ ui::Selectable::Ptr selectable { ui::Selectable::get (resolvable) };
+
+ if (selectable->identicalAvailableObj (installedPI) != NULL)
+ pi = selectable->identicalAvailableObj (installedPI);
+ else
+ pi = selectable->updateCandidateObj ();
+
+ repo = g_strconcat ("installed:", pi.repository ().alias ().c_str (),
NULL);
+ } else
+ repo = g_strdup (resolvable.repository ().alias ().c_str ());
+
package_id = pk_package_id_build (resolvable.name ().c_str (),
resolvable.edition ().asString
().c_str (),
- arch, repo.c_str ());
+ arch, repo);
return package_id;
}
++++++ PackageKit-zypp-dont-remove-locked-packages.patch ++++++
Index: PackageKit-1.2.5/backends/zypp/pk-backend-zypp.cpp
===================================================================
--- PackageKit-1.2.5.orig/backends/zypp/pk-backend-zypp.cpp
+++ PackageKit-1.2.5/backends/zypp/pk-backend-zypp.cpp
@@ -2940,6 +2940,12 @@ backend_remove_packages_thread (PkBacken
return;
}
PoolItem item(solvable);
+ if (item.status ().isLocked ()) {
+ zypp_backend_finished_error (job,
PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE,
+ "Failed to remove %s: Locked package.",
+ solvable.name ().c_str ());
+ return;
+ }
if (solvable.isSystem ()) {
item.status ().setToBeUninstalled (ResStatus::USER);
items.push_back (item);
