rpms/PackageKit/F-11 PackageKit-0.4.6-Presto-dont-filter.patch, NONE, 1.1 PackageKit-0.4.6-Presto-handle-downloading-updates.patch, NONE, 1.1 PackageKit.spec, 1.101, 1.102

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1942

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.4.6-Presto-dont-filter.patch 
	PackageKit-0.4.6-Presto-handle-downloading-updates.patch 
Log Message:
* Sun Apr 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-4
- Backport 2 patches from upstream to make Presto work better with PK.


PackageKit-0.4.6-Presto-dont-filter.patch:

--- NEW FILE PackageKit-0.4.6-Presto-dont-filter.patch ---
commit 1186bd2309879ff83cb57a1cbbf4f65949826d1e
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Apr 16 17:10:17 2009 +0100

    bugfix: don't filter out 'Presto' unconditionally from the stdout to fix rh#496091

diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
index d7e8328..05f573c 100644
--- a/backends/yum/pk-backend-yum.c
+++ b/backends/yum/pk-backend-yum.c
@@ -48,9 +48,6 @@ backend_stderr_cb (PkBackend *backend, const gchar *output)
 static gboolean
 backend_stdout_cb (PkBackend *backend, const gchar *output)
 {
-	/* presto is much too verbose... */
-	if (strstr (output, "Presto") != NULL)
-		return FALSE;
 	return TRUE;
 }
 

PackageKit-0.4.6-Presto-handle-downloading-updates.patch:

--- NEW FILE PackageKit-0.4.6-Presto-handle-downloading-updates.patch ---
commit dd136f6760d375ba55ec98ab02291028c03d8b46
Author: Richard Hughes <richard at hughsie.com>
Date:   Sun Apr 19 11:59:42 2009 +0100

    yum: Deal with Presto downloading updates in a better way

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 5870eb7..7119c6a 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -36,6 +36,7 @@ from yum.callbacks import *
 from yum.misc import prco_tuple_to_string, unique
 from yum.packages import YumLocalPackage, parsePackages
 from yum.packageSack import MetaSack
+from yum.sqlitesack import YumAvailablePackageSqlite
 import rpmUtils
 import exceptions
 import types
@@ -2559,6 +2560,9 @@ class DownloadCallback(BaseMeter):
             for pkg in self.saved_pkgs:
                 if isinstance(pkg, YumLocalPackage):
                     rpmfn = pkg.localPkg
+                elif isinstance(pkg, YumAvailablePackageSqlite):
+                    # from yum-presto, so not a local package
+                    return pkg
                 else:
                     rpmfn = os.path.basename(pkg.remote_path) # get the rpm filename of the package
                 if rpmfn == name:


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- PackageKit.spec	14 Apr 2009 16:19:06 -0000	1.101
+++ PackageKit.spec	20 Apr 2009 10:32:45 -0000	1.102
@@ -10,7 +10,7 @@
 Name:      PackageKit
 Version:   0.4.6
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -42,6 +42,12 @@
 # Already upstream: 31b85c79d516d0b97b87c2b205e9fea00c9190ed..426e6a8ba3be3408347af1d8f200956818e230cf
 Patch7:    PackageKit-0.4.6-dont-use-obsolete-interfaces.patch
 
+# Already upstream: 1186bd2309879ff83cb57a1cbbf4f65949826d1e
+Patch8:    PackageKit-0.4.6-Presto-dont-filter.patch
+
+# Already upstream: dd136f6760d375ba55ec98ab02291028c03d8b46
+Patch9:    PackageKit-0.4.6-Presto-handle-downloading-updates.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -248,6 +254,8 @@
 %patch5 -p1 -b .cmd-not-found-lengths
 %patch6 -p1 -b .sync-logic
 %patch7 -p1 -b .dont-use-obsolete
+%patch8 -p1 -b .presto-filter
+%patch9 -p1 -b .presto-downloading-updates
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
@@ -442,6 +450,9 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Sun Apr 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-4
+- Backport 2 patches from upstream to make Presto work better with PK.
+
 * Tue Apr 14 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.6-3
 - Backport 4 important patches from upstream.