rpms/PackageKit/devel pk-fix-pkcon-resolve.patch, NONE, 1.1 PackageKit.spec, 1.73, 1.74

[Richard Hughes]

Author: rhughes

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

Modified Files:
	PackageKit.spec 
Added Files:
	pk-fix-pkcon-resolve.patch 
Log Message:
* Thu Oct 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.8-3
- Add a patch from upstream to pkcon install foo


pk-fix-pkcon-resolve.patch:

--- NEW FILE pk-fix-pkcon-resolve.patch ---
commit 85afc2b5cc7e68c8184ae4ca7df4e1d7ed1d5258
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Oct 23 12:08:50 2008 +0100

    bugfix: don't reuse a variable to check for installed, else we fail the resolve in pkcon

diff --git a/client/pk-console.c b/client/pk-console.c
index 78ff544..8a0af52 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -553,6 +553,7 @@ static gboolean
 pk_console_install_stuff (PkClient *client, gchar **packages, GError **error)
 {
 	gboolean ret = TRUE;
+	gboolean installed;
 	gboolean is_local;
 	gchar *package_id = NULL;
 	gchar **package_ids = NULL;
@@ -573,8 +574,8 @@ pk_console_install_stuff (PkClient *client, gchar **packages, GError **error)
 			g_ptr_array_add (array_files, g_strdup (packages[i]));
 		} else {
 			/* if already installed, then abort */
-			ret = pk_console_is_installed (packages[i]);
-			if (ret) {
+			installed = pk_console_is_installed (packages[i]);
+			if (installed) {
 				/* TRANSLATORS: The package is already installed on the system */
 				*error = g_error_new (1, 0, _("The package '%s' is already installed"), packages[i]);
 				ret = FALSE;


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- PackageKit.spec	21 Oct 2008 15:47:23 -0000	1.73
+++ PackageKit.spec	23 Oct 2008 11:14:41 -0000	1.74
@@ -8,15 +8,15 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.8
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream: 34fc97830dd9ced41b9f8873ea5c357de25e3c46
-#Patch0:    pk-idle-add-pkcontrol-refresh.patch
+# upstream: 85afc2b5cc7e68c8184ae4ca7df4e1d7ed1d5258
+Patch0:    pk-fix-pkcon-resolve.patch
 
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -371,6 +371,9 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Thu Oct 23 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.8-3
+- Add a patch from upstream to pkcon install foo
+
 * Tue Oct 21 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.3.8-2
 - Obsoletes: packagekit-qt(-devel)/qpackagekit(-devel)
 - cleanup deps