From a02bbc1083bc0a0a07e713345aa22381d6ac85a2 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 5 Jul 2012 15:26:37 +0100 Subject: [PATCH] Correctly write the /var/lib/PackageKit/prepared-update file. --- PackageKit-0.8.1-master.patch | 30 ++++++++++++++++++++++++++++++ PackageKit.spec | 5 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/PackageKit-0.8.1-master.patch b/PackageKit-0.8.1-master.patch index 832e17e..0c7ea23 100644 --- a/PackageKit-0.8.1-master.patch +++ b/PackageKit-0.8.1-master.patch @@ -1020,3 +1020,33 @@ index 0000000..b0abc8d + g_free (path); + return; +} +commit 587b14d08196509ebf93a6bc0d1ab0fe76b6ef89 +Author: Richard Hughes +Date: Thu Jul 5 15:23:37 2012 +0100 + + Set the exit code before running the plugin finished handlers + +diff --git a/src/pk-transaction.c b/src/pk-transaction.c +index 814ea5d..2d5e06c 100644 +--- a/src/pk-transaction.c ++++ b/src/pk-transaction.c +@@ -1146,6 +1146,9 @@ pk_transaction_finished_cb (PkBackendJob *job, PkExitEnum exit_enum, PkTransacti + return; + } + ++ /* save this so we know if the cache is valid */ ++ pk_results_set_exit_code (transaction->priv->results, exit_enum); ++ + /* run the plugins */ + pk_transaction_plugin_phase (transaction, + PK_PLUGIN_PHASE_TRANSACTION_FINISHED_START); +@@ -1158,9 +1161,6 @@ pk_transaction_finished_cb (PkBackendJob *job, PkExitEnum exit_enum, PkTransacti + pk_transaction_plugin_phase (transaction, + PK_PLUGIN_PHASE_TRANSACTION_FINISHED_END); + +- /* save this so we know if the cache is valid */ +- pk_results_set_exit_code (transaction->priv->results, exit_enum); +- + /* if we did not send this, ensure the GUI has the right state */ + if (transaction->priv->allow_cancel) + pk_transaction_allow_cancel_emit (transaction, FALSE); diff --git a/PackageKit.spec b/PackageKit.spec index 81e4cdd..832d8b7 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -3,7 +3,7 @@ Summary: Package management service Name: PackageKit Version: 0.8.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.packagekit.org Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz @@ -472,6 +472,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/packagekit-plugin.pc %changelog +* Thu Jul 05 2012 Richard Hughes - 0.8.1-5 +- Correctly write the /var/lib/PackageKit/prepared-update file. + * Mon Jul 02 2012 Richard Hughes - 0.8.1-4 - Fix several reported problems with the offline-update funtionality.