rpms/PackageKit/F-12 PackageKit-0.5.4-fix-cnf-more.patch, NONE, 1.1 PackageKit.spec, 1.125, 1.126

[Richard Hughes]

Author: rhughes

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

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.5.4-fix-cnf-more.patch 
Log Message:
* Mon Nov 16 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.4-0.3.20091029git
- When searching for available packages to install, use our preferred arch.
- Handle the error condition where the package name would be invalid.
- Fixes #534169 and #533014


PackageKit-0.5.4-fix-cnf-more.patch:
 b/contrib/command-not-found/pk-command-not-found.c |    4 +++-
 contrib/command-not-found/pk-command-not-found.c   |    4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE PackageKit-0.5.4-fix-cnf-more.patch ---
commit 78a591b9942afa19f6e21ac987a70af8a9faa05b
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Nov 10 20:47:25 2009 +0000

    cnf: when we search for available files, use our preferred arch. Fixes rh#534169

diff --git a/contrib/command-not-found/pk-command-not-found.c b/contrib/command-not-found/pk-command-not-found.c
index ee16e43..88b7da7 100644
--- a/contrib/command-not-found/pk-command-not-found.c
+++ b/contrib/command-not-found/pk-command-not-found.c
@@ -413,7 +413,9 @@ pk_cnf_find_available (const gchar *cmd)
 		values[i] = g_build_filename (prefixes[i], cmd, NULL);
 
 	/* do search */
-	filters = pk_bitfield_from_enums (PK_FILTER_ENUM_NOT_INSTALLED, PK_FILTER_ENUM_NEWEST, -1);
+	filters = pk_bitfield_from_enums (PK_FILTER_ENUM_NOT_INSTALLED,
+					  PK_FILTER_ENUM_NEWEST,
+					  PK_FILTER_ENUM_ARCH, -1);
 	results = pk_client_search_file (PK_CLIENT(task), filters, values, cancellable,
 					 (PkProgressCallback) pk_cnf_progress_cb, NULL, &error);
 	if (results == NULL) {
commit 12bafbe62e16dcd07f1573807629d830199a868d
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 5 10:34:25 2009 +0000

    cnf: handle the error condition where the package name would be invalid. Fixes rh#533014

diff --git a/contrib/command-not-found/pk-command-not-found.c b/contrib/command-not-found/pk-command-not-found.c
index 3b91e15..4e3f4b3 100644
--- a/contrib/command-not-found/pk-command-not-found.c
+++ b/contrib/command-not-found/pk-command-not-found.c
@@ -752,6 +752,10 @@ main (int argc, char *argv[])
 	/* only search using PackageKit if configured to do so */
 	} else if (config->software_source_search) {
 		package_ids = pk_cnf_find_available (argv[1]);
+		if (package_ids == NULL) {
+			g_print ("\n");
+			goto out;
+		}
 		len = g_strv_length (package_ids);
 		if (len == 1) {
 			parts = pk_package_id_split (package_ids[0]);
commit fec9a2ace5bbe7d3656c9ea12d6d9713cb15fa3f
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Oct 20 08:55:05 2009 +0100

    cnf: don't exit before we try to search if no alternatives were found




Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/PackageKit.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- PackageKit.spec	9 Nov 2009 11:28:26 -0000	1.125
+++ PackageKit.spec	16 Nov 2009 14:29:24 -0000	1.126
@@ -10,7 +10,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.5.4
-Release:   0.2.%{?alphatag}git%{?dist}
+Release:   0.3.%{?alphatag}git%{?dist}
 #Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
@@ -27,6 +27,7 @@ Patch1:    PackageKit-0.4.4-Fedora-turn-
 
 # already upstream
 Patch2:    PackageKit-0.5.4-fix-cnf-exec.patch
+Patch3:    PackageKit-0.5.4-fix-cnf-more.patch
 
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -248,6 +249,7 @@ user to restart the computer or remove a
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
 %patch2 -p1 -b .cnf-fix-exec
+%patch3 -p1 -b .cnf-fix-more
 
 %build
 %configure \
@@ -458,6 +460,11 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Nov 16 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.4-0.3.20091029git
+- When searching for available packages to install, use our preferred arch.
+- Handle the error condition where the package name would be invalid.
+- Fixes #534169 and #533014
+
 * Mon Nov 09 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.4-0.2.20091029git
 - Fix a critical bug in the command-not-found code that triggers an infinite
   loop when a new package is installed.