[packagekit] packagekit: Branch 'master' - 5 commits

[Richard Hughes]

 backends/yum2/helpers/yumDBUSBackend.py |    4 +++-
 client/pk-console.c                     |    2 --
 python/packagekit/daemonBackend.py      |    2 +-
 src/pk-backend-dbus.c                   |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f9453891e5992dc122406cfce27f946d6f0fa0b1
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Fri Feb 22 15:33:52 2008 -0500

    For some reason, the 'finished' signal was connected twice.

diff --git a/client/pk-console.c b/client/pk-console.c
index 055d042..29ed65a 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -1108,8 +1108,6 @@ main (int argc, char *argv[])
 	client_task = pk_client_new ();
 	pk_client_set_use_buffer (client_task, TRUE);
 	pk_client_set_synchronous (client_task, TRUE);
-	g_signal_connect (client, "finished",
-			  G_CALLBACK (pk_console_finished_cb), NULL);
 
 	role_list = pk_client_get_actions (client);
 	pk_debug ("actions=%s", pk_enum_list_to_string (role_list));
commit b77aafd7577586f84c5932d39f86c9e665454144
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Fri Feb 22 15:21:45 2008 -0500

    Fix error code when package is not found for install.

diff --git a/backends/yum2/helpers/yumDBUSBackend.py b/backends/yum2/helpers/yumDBUSBackend.py
index 3a42b33..0d4ac23 100755
--- a/backends/yum2/helpers/yumDBUSBackend.py
+++ b/backends/yum2/helpers/yumDBUSBackend.py
@@ -694,7 +694,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
                 self.Finished(EXIT_FAILED)
                 return
         else:
-            self.ErrorCode(ERROR_PACKAGE_ALREADY_INSTALLED,"Package was not found")
+            self.ErrorCode(ERROR_PACKAGE_NOT_FOUND,"Package was not found")
             self.Finished(EXIT_FAILED)
             return
             
commit 7df76297748cbb1ac34a98db8024cbb04b686325
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Fri Feb 22 15:07:32 2008 -0500

    Set the cache 'properly'.

diff --git a/backends/yum2/helpers/yumDBUSBackend.py b/backends/yum2/helpers/yumDBUSBackend.py
index 81b8e2e..3a42b33 100755
--- a/backends/yum2/helpers/yumDBUSBackend.py
+++ b/backends/yum2/helpers/yumDBUSBackend.py
@@ -1498,8 +1498,10 @@ class PackageKitYumBackend(PackageKitBaseBackend):
             self.Init()
         if cache:
             self.yumbase.conf.cache = 1
+            self.yumbase.repos.setCache(1)
         else:
             self.yumbase.conf.cache = 0
+            self.yumbase.repos.setCache(0)
 
     def _get_package_ver(self,po):
         ''' return the a ver as epoch:version-release or version-release, if epoch=0'''
commit c4e1818b5337bb862a3ab046cc3bd85fe581152a
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Fri Feb 22 14:27:04 2008 -0500

    Finish fixing Description signal.

diff --git a/src/pk-backend-dbus.c b/src/pk-backend-dbus.c
index ae80095..9bb40de 100644
--- a/src/pk-backend-dbus.c
+++ b/src/pk-backend-dbus.c
@@ -197,7 +197,7 @@ static void
 pk_backend_dbus_description_cb (DBusGProxy *proxy, const gchar *package_id,
 				const gchar *license, const gchar *group_text,
 				const gchar *detail, const gchar *url,
-				guint32 size, PkBackendDbus *backend_dbus)
+				guint64 size, PkBackendDbus *backend_dbus)
 {
 	pk_debug ("got signal");
 	pk_backend_description (backend_dbus->priv->backend, package_id,
commit 676dea36affff245125292df2919e7e27306fae9
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Fri Feb 22 14:02:22 2008 -0500

    o 'bytes' in the description signal is supposed to be a uint64, not a uint32.

diff --git a/python/packagekit/daemonBackend.py b/python/packagekit/daemonBackend.py
index dd4f82d..c484534 100644
--- a/python/packagekit/daemonBackend.py
+++ b/python/packagekit/daemonBackend.py
@@ -127,7 +127,7 @@ class PackageKitBaseBackend(dbus.service.Object):
 
     @PKSignalHouseKeeper
     @dbus.service.signal(dbus_interface=PACKAGEKIT_DBUS_INTERFACE,
-                         signature='sssssu')
+                         signature='ssssst')
     def Description(self, package_id, license, group, detail, url, size):
         print "Description (%s, %s, %s, %s, %s, %u)" % (package_id, license, group, detail, url, size)