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

[Richard Hughes]

 backends/yum/helpers/yumBackend.py           |    4 ++--
 contrib/yum-packagekit/refresh-packagekit.py |    3 ++-
 docs/html/img/author-timlau.png              |binary
 docs/html/pk-authors.html                    |    2 +-
 man/pkcon.sgml                               |    2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 6e0c338f9347a199e143eec0affec045b2cc970e
Author: Luke Macken <lmacken at redhat.com>
Date:   Sun Dec 16 04:27:10 2007 -0500

    Use the correct bus name and object path in the refresh-packagekit yum plugin

diff --git a/contrib/yum-packagekit/refresh-packagekit.py b/contrib/yum-packagekit/refresh-packagekit.py
index dcd1477..247be9b 100644
--- a/contrib/yum-packagekit/refresh-packagekit.py
+++ b/contrib/yum-packagekit/refresh-packagekit.py
@@ -31,7 +31,8 @@ def posttrans_hook(conduit):
         conduit.info(6, "%s" %(e,))
         return
     try:
-        packagekit_proxy = bus.get_object('org.freedesktop.PackageKit.yum', '/PackageKit')
+        packagekit_proxy = bus.get_object('org.freedesktop.PackageKit',
+                                          '/org/freedesktop/PackageKit')
         packagekit_iface = dbus.Interface(packagekit_proxy, 'org.freedesktop.PackageKit')
         packagekit_iface.StateHasChanged()
     except dbus.DBusException, e:
commit 3a8b7f9bbc211dd469bc09580bccb424add68d74
Author: Luke Macken <lmacken at redhat.com>
Date:   Sun Dec 16 04:16:29 2007 -0500

    Use PackageKitYumBackend._is_inst in place of our self.yumbase.rpmdb.installed calls

diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index 5e9888b..4a8efc6 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -547,7 +547,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
         # we look through each returned possibility and rule out the
         # ones that we obviously can't use
 
-        if self.yumbase.rpmdb.installed(po=pkg):
+        if self._is_inst(pkg):
             return False
 
         # everything installed that matches the name
commit bcb1145155c38bd327df5c590dc4e6dbdd52842c
Author: Luke Macken <lmacken at redhat.com>
Date:   Sat Dec 15 21:08:34 2007 -0500

    Reference pkmon(1) from the pkcon(1) man page

diff --git a/man/pkcon.sgml b/man/pkcon.sgml
index dd5b6ec..44469bc 100644
--- a/man/pkcon.sgml
+++ b/man/pkcon.sgml
@@ -65,7 +65,7 @@ manpage.1: manpage.sgml
   </refsect1>
   <refsect1>
     <title>SEE ALSO</title>
-    <para>pkcon (1).</para>
+    <para>pkmon (1).</para>
     <para>
       The programs are documented fully on http://www.packagekit.org.
     </para>
commit 82be19218112b826540ab35f09622d29a3750b2f
Author: Luke Macken <lmacken at redhat.com>
Date:   Sat Dec 15 00:31:27 2007 -0500

    Fix typo in PackageKitYumBackend._findPackage docstring

diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index 0f40849..5e9888b 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -501,7 +501,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
 
     def _findPackage(self,id):
         '''
-        find a package based on a packahe id (name;version;arch;repoid)
+        find a package based on a package id (name;version;arch;repoid)
         '''
         # Split up the id
         (n,idver,a,d) = self.get_package_from_id(id)
commit 4ed2f5635bb1c26e08e48e09a9b5141e4fcdcb98
Author: Tim Lauridsen <tla at rasmil.dk>
Date:   Fri Dec 14 09:03:14 2007 +0100

    Added my picture to author doc

diff --git a/docs/html/img/author-timlau.png b/docs/html/img/author-timlau.png
new file mode 100644
index 0000000..a056b66
Binary files /dev/null and b/docs/html/img/author-timlau.png differ
diff --git a/docs/html/pk-authors.html b/docs/html/pk-authors.html
index b7880db..5572d8f 100644
--- a/docs/html/pk-authors.html
+++ b/docs/html/pk-authors.html
@@ -116,7 +116,7 @@
 
 <tr>
  <td>
-  <img src="img/author-unknown.png" alt="[img]"/><!-- image should be 120px wide -->
+  <img src="img/author-timlau.png" alt="[img]"/><!-- image should be 120px wide -->
  </td>
  <td>
   <h2>Tim Lauridsen</h2>