rpms/PackageKit/devel pk-dont-schedule-the-whole-queue.patch, NONE, 1.1 PackageKit.spec, 1.58, 1.59

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15765

Modified Files:
	PackageKit.spec 
Added Files:
	pk-dont-schedule-the-whole-queue.patch 
Log Message:
* Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-3
- Don't try to run all the committed transactions at once with a deep queue.
- This fixes the bug where the dispatcher would sometimes fail to run the
  next method and PkSpawn would warn the user with 'timeout already set'.


pk-dont-schedule-the-whole-queue.patch:

--- NEW FILE pk-dont-schedule-the-whole-queue.patch ---
commit 95a2dcf78ba0e2ae6262bfae897a16b0e26408c8
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Sep 23 11:43:36 2008 +0100

    bugfix: when we have more than one transaction queued, don't try to run them all at once
    
    This bug was never triggered before as we were running each pk_transaction_run in a loop
    and so blocked at this point. Now we are idle_add'ing them, it's possible for all of
    the remaining queue to be dispatched at the same time.
    This fixes the bug where the dispatcher would sometimes fail to run the second method
    and PkSpawn would error out with 'trying to set timeout when already set'.

diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c
index d8da409..23bbcf0 100644
--- a/src/pk-transaction-list.c
+++ b/src/pk-transaction-list.c
@@ -293,8 +293,10 @@
 		item = (PkTransactionItem *) g_ptr_array_index (tlist->priv->array, i);
 		if (item->committed &&
 		    !item->running &&
-		    !item->finished)
+		    !item->finished) {
 			pk_transaction_list_run_item (tlist, item);
+			break;
+		}
 	}
 }
 


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- PackageKit.spec	23 Sep 2008 10:02:40 -0000	1.58
+++ PackageKit.spec	23 Sep 2008 11:20:27 -0000	1.59
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -18,6 +18,9 @@
 # upstream: c9a01198d494f06ae9e0b3e2a002f941da118f00
 Patch0:    pk-dont-send-finished-from-dispatcher.patch
 
+# upstream: 95a2dcf78ba0e2ae6262bfae897a16b0e26408c8
+Patch1:    pk-dont-schedule-the-whole-queue.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
@@ -143,6 +146,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -273,6 +277,11 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-3
+- Don't try to run all the committed transactions at once with a deep queue.
+- This fixes the bug where the dispatcher would sometimes fail to run the
+  next method and PkSpawn would warn the user with 'timeout already set'.
+
 * Tue Sep 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.4-2
 - Don't send ::Finished when the script exits because of a dispatcher exit.
 - This only seems to happen when we are making the dispatcher be reloaded