upstream patch to fix packagekitd crash on assertion failure (see https://github.com/PackageKit/PackageKit/issues/656 ) [release 1.2.7-2mamba;Thu Sep 14 2023]

This commit is contained in:
Silvan Calarco 2024-01-05 17:51:46 +01:00
parent 01c529fbb9
commit fddaec7715
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 96a05994d528777ad7708c49dac012145693df1d Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Sun, 27 Aug 2023 19:04:20 +0200
Subject: [PATCH] transaction: We only need to emit finished when we were
committed
A transaction that has been staged but never actually has been committed
to run will never emit a ::Finished signal, and in this case that is
acceptable behavior.
Resolves: #656
---
src/pk-transaction.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index c9856b0a3..39ef37c97 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -5524,8 +5524,10 @@ pk_transaction_dispose (GObject *object)
}
if (transaction->priv->registration_id > 0) {
- /* We should have emitted ::Finished if the object was ever registered */
- g_assert (transaction->priv->emitted_finished);
+ /* We should have emitted ::Finished if the object was ever registered and committed */
+ if (transaction->priv->state != PK_TRANSACTION_STATE_UNKNOWN &&
+ transaction->priv->state != PK_TRANSACTION_STATE_NEW)
+ g_assert (transaction->priv->emitted_finished);
g_dbus_connection_unregister_object (transaction->priv->connection,
transaction->priv->registration_id);

View File

@ -1,6 +1,6 @@
Name: PackageKit Name: PackageKit
Version: 1.2.7 Version: 1.2.7
Release: 1mamba Release: 2mamba
Summary: A system designed to make installing and updating software on your computer easier Summary: A system designed to make installing and updating software on your computer easier
Group: System/Management Group: System/Management
Vendor: openmamba Vendor: openmamba
@ -17,6 +17,7 @@ Patch16: PackageKit-1.1.12-dnf-repos-dir.patch
Patch17: PackageKit-1.1.12-dnf-disable-trusted-packages-check.patch Patch17: PackageKit-1.1.12-dnf-disable-trusted-packages-check.patch
Patch18: PackageKit-1.1.12-upstream-dnf-invalidate-the-sack-cache-after-downloading-new-metadata.patch Patch18: PackageKit-1.1.12-upstream-dnf-invalidate-the-sack-cache-after-downloading-new-metadata.patch
Patch19: PackageKit-1.2.6-enable-ShutdownTimeout.patch Patch19: PackageKit-1.2.6-enable-ShutdownTimeout.patch
Patch20: PackageKit-1.2.7-upstream-fix-pk_transaction_dispose-assertion_failed.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -95,6 +96,7 @@ This package contains the Gtk interface library for %{name}.
%patch 17 -p1 %patch 17 -p1
#%patch18 -p1 #%patch18 -p1
%patch 19 -p1 %patch 19 -p1
%patch 20 -p1 -b .upstream-fix-pk_transaction_dispose-assertion_failed
sed -i "s|openmandriva|openmamba|" meson_options.txt sed -i "s|openmandriva|openmamba|" meson_options.txt
@ -190,6 +192,9 @@ install -d -m0755 %{buildroot}/var/cache/PackageKit
%doc NEWS README %doc NEWS README
%changelog %changelog
* Thu Sep 14 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.7-2mamba
- upstream patch to fix packagekitd crash on assertion failure (see https://github.com/PackageKit/PackageKit/issues/656 )
* Sat Sep 02 2023 Automatic Build System <autodist@mambasoft.it> 1.2.7-1mamba * Sat Sep 02 2023 Automatic Build System <autodist@mambasoft.it> 1.2.7-1mamba
- automatic version update by autodist - automatic version update by autodist