Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2018-12-28 12:33:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit" Fri Dec 28 12:33:34 2018 rev:181 rq:661478 version:1.1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2018-12-05 09:36:21.253167408 +0100 +++ /work/SRC/openSUSE:Factory/.PackageKit.new.28833/PackageKit.changes 2018-12-28 12:33:36.788034947 +0100 @@ -1,0 +2,15 @@ +Wed Dec 26 06:36:22 UTC 2018 - [email protected] + +- Drop PackageKit-avoid-endless-loop-on-autoupdate.patch: With + PackageKit-return-on-transactions-going-backwards.patch and + PackageKit-remove-default-thread-check.patch, EULA promt works + without any issue (bsc#1038425). +- Add PackageKit-remove-default-thread-check.patch: Remove the + pk_is_thread_default() check in pk_backend_is_eula_valid() so + that we can call it in zypp backend without any issue + (gh#hughsie/PackageKit#301, bsc#1038425). +- Add PackageKit-return-on-transactions-going-backwards.patch: + transaction: Return directly when its state is going backwards + (gh#hughsie/PackageKit#301, bsc#1038425). + +------------------------------------------------------------------- Old: ---- PackageKit-avoid-endless-loop-on-autoupdate.patch New: ---- PackageKit-remove-default-thread-check.patch PackageKit-return-on-transactions-going-backwards.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.92Gh04/_old 2018-12-28 12:33:37.188034669 +0100 +++ /var/tmp/diff_new_pack.92Gh04/_new 2018-12-28 12:33:37.192034666 +0100 @@ -39,10 +39,12 @@ Source2: baselibs.conf Source3: PackageKit.tmpfiles Source99: PackageKit.keyring -# PATCH-FIX-UPSTREAM PackageKit-avoid-endless-loop-on-autoupdate.patch [email protected] -- Avoid a endless loop on autoupdates. -Patch0: PackageKit-avoid-endless-loop-on-autoupdate.patch # PATCH-FIX-OPENSUSE PackageKit-cron-without-sleep.patch boo#1071521 [email protected] -- Do not sleep in the cron job; our cron mechansim has sufficient randomization -Patch2: PackageKit-cron-without-sleep.patch +Patch0: PackageKit-cron-without-sleep.patch +# PATCH-FIX-UPSTREAM PackageKit-return-on-transactions-going-backwards.patch gh#hughsie/PackageKit#301, bsc#1038425 [email protected] -- transaction: Return directly when its state is going backwards +Patch1: PackageKit-return-on-transactions-going-backwards.patch +# PATCH-FIX-UPSTREAM PackageKit-remove-default-thread-check.patch gh#hughsie/PackageKit#303, bsc#1038425 [email protected] -- Remove pk_is_thread_default() check in pk_backend_is_eula_valid +Patch2: PackageKit-remove-default-thread-check.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel @@ -221,6 +223,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch2 -p1 translation-update-upstream ++++++ PackageKit-remove-default-thread-check.patch ++++++ >From 8060817fcc4fa31c5fc66da988027c4ea5810be9 Mon Sep 17 00:00:00 2001 From: Jonathan Kang <[email protected]> Date: Wed, 26 Dec 2018 11:18:42 +0800 Subject: [PATCH] Remove pk_is_thread_default check in pk_backend_is_eula_valid pk_is_thread_default() check was introduced in commit 44bd3ab6 to detect possible threading problems. Some backends need call pk_backend_is_eula_valid() in a thread which is not the default one to perform EULA related actions. This way pk_is_thread_default() check fails. Fix that by removing the pk_is_thread_default() check in pk_backend_is_eula_valid(). Fixes #300 --- src/pk-backend.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pk-backend.c b/src/pk-backend.c index 38f32a04c..2dc464938 100644 --- a/src/pk-backend.c +++ b/src/pk-backend.c @@ -955,7 +955,6 @@ pk_backend_is_eula_valid (PkBackend *backend, const gchar *eula_id) g_return_val_if_fail (PK_IS_BACKEND (backend), FALSE); g_return_val_if_fail (eula_id != NULL, FALSE); - g_return_val_if_fail (pk_is_thread_default (), FALSE); present = g_hash_table_lookup (backend->priv->eulas, eula_id); if (present != NULL) -- 2.20.1 ++++++ PackageKit-return-on-transactions-going-backwards.patch ++++++ >From d1b76c05ebb4c5643bcf0072f271bcd958812560 Mon Sep 17 00:00:00 2001 From: Jonathan Kang <[email protected]> Date: Fri, 21 Dec 2018 16:17:34 +0800 Subject: [PATCH] =?UTF-8?q?transaction:=20Return=20directly=20when=20its?= =?UTF-8?q?=C2=A0state=20is=20going=20backwards?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We should return directly while failing to set transaction’s state because it’s going backwards. That’s exactly what Pk did previously. Fixes 2807cbf8 --- src/pk-transaction.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pk-transaction.c b/src/pk-transaction.c index 76e99655f..d14ea7d9c 100644 --- a/src/pk-transaction.c +++ b/src/pk-transaction.c @@ -760,6 +760,7 @@ pk_transaction_set_state (PkTransaction *transaction, PkTransactionState state) g_warning ("cannot set %s, as already %s", pk_transaction_state_to_string (state), pk_transaction_state_to_string (priv->state)); + return; } g_debug ("transaction now %s", pk_transaction_state_to_string (state)); -- 2.20.1
