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

[Richard Hughes]

 backends/dummy/pk-backend-dummy.c       |    2 --
 backends/yum/helpers/yumBackend.py      |   11 ++++++-----
 docs/html/img/pk-application-search.png |binary
 docs/spec/pk-introduction.xml           |    3 ++-
 libpackagekit/pk-debug.c                |   10 ++++++++++
 libpackagekit/pk-debug.h                |    1 +
 6 files changed, 19 insertions(+), 8 deletions(-)

New commits:
commit 0fc029fe268e6d8cc5d1c42be5df1711ff17c265
Merge: d6f9fe7... ab55f6d...
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Sat Jan 5 01:12:03 2008 -0500

    Merge branch 'master' of git+ssh://mclasen@git.packagekit.org/srv/git/PackageKit

commit d6f9fe72ef7bed1ef9a9297606d33645e06c197b
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Sat Jan 5 01:10:45 2008 -0500

    Fix another problem with urls

diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index a824010..cc2a7e0 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -1125,7 +1125,8 @@ class PackageKitYumBackend(PackageKitBaseBackend):
                 reboot = 'none'
             return self._format_str(desc),urls,reboot
         else:
-            return "","","none"
+            urls = {'bugzilla':[], 'cve' : []}
+            return "",urls,"none"
 
     def get_update_detail(self,package):
         '''
commit ab55f6dd4da9c0829ec3c86c291fa2b27469d7bc
Author: Richard Hughes <richard at hughsie.com>
Date:   Sat Jan 5 00:22:00 2008 +0000

    the message about 4/5 really winds me up..

diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index cf2a521..fc44f90 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -178,8 +178,6 @@ backend_get_updates (PkBackend *backend)
 
 	/* only find updates one in 5 times */
 	if (number != 1) {
-		pk_backend_message (backend, PK_MESSAGE_ENUM_NOTICE,
-				    "Ignoring this GetUpdate as 4/5!");
 		pk_backend_finished (backend);
 		return;
 	}
commit ed285d710fd9e6bf2929835d39ed6f9069ebc568
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Jan 4 18:50:00 2008 +0000

    update a screenshot

diff --git a/docs/html/img/pk-application-search.png b/docs/html/img/pk-application-search.png
index 9f0b151..03ab912 100644
Binary files a/docs/html/img/pk-application-search.png and b/docs/html/img/pk-application-search.png differ
commit 0e6ab01b7f4bd2aa0d8a4e1dfe54e6453b727f42
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Jan 4 18:37:01 2008 +0000

    only do the 100 limit count on emitted packages, not on searched packages. This bug becomes evident when using a couple of filters and searching a large number of package_ids.

diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index fee193b..8ec99e9 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -310,13 +310,13 @@ class PackageKitYumBackend(PackageKitBaseBackend):
             available = []
             count = 1
             for (pkg,values) in res:
-                if count > 100:
-                    break
-                count+=1
                 # are we installed?
                 if pkg.repoid == 'installed':
                     if FILTER_NOT_INSTALLED not in fltlist:
                         if self._do_extra_filtering(pkg,fltlist):
+                            count+=1
+                            if count > 100:
+                                break
                             self._show_package(pkg, INFO_INSTALLED)
                 else:
                     available.append(pkg)
commit 6154f3bbb6b9db24afeef8cece8bea5faa9a7768
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Jan 4 15:42:40 2008 +0000

    an empty url list should be empty, not 'none'

diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index a824010..fee193b 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -1098,7 +1098,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
         if lst:
             return ";".join(lst)
         else:
-            return "none"
+            return ""
 
     def _get_update_extras(self,pkg):
         md = self.updateMetadata
diff --git a/docs/spec/pk-introduction.xml b/docs/spec/pk-introduction.xml
index 9cdf8a6..df37e23 100644
--- a/docs/spec/pk-introduction.xml
+++ b/docs/spec/pk-introduction.xml
@@ -1738,7 +1738,8 @@
             <row>
               <entry><literal>bugzilla_url</literal></entry>
               <entry>
-                A bugzilla URL with more details on the update
+                A bugzilla URL with more details on the update.
+                If no URL is available then this field should be left empty.
               </entry>
             </row>
             <row>
commit 431cb7d81648343f79bcf80014e7d78ebc25e009
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Jan 4 14:47:25 2008 +0000

    add pk_debug_enabled so we can hopefully detect if we are running in verbose mode in a helper

diff --git a/libpackagekit/pk-debug.c b/libpackagekit/pk-debug.c
index 7fca55c..f9e8e62 100644
--- a/libpackagekit/pk-debug.c
+++ b/libpackagekit/pk-debug.c
@@ -135,6 +135,16 @@ pk_error_real (const gchar *func, const gchar *file, const int line, const gchar
 }
 
 /**
+ * pk_debug_enabled:
+ * Return value: If we have debugging enabled
+ **/
+gboolean
+pk_debug_enabled (void)
+{
+	return do_verbose;
+}
+
+/**
  * pk_debug_init:
  * @debug: If we should print out verbose logging
  **/
diff --git a/libpackagekit/pk-debug.h b/libpackagekit/pk-debug.h
index 81f68d5..320c5c4 100644
--- a/libpackagekit/pk-debug.h
+++ b/libpackagekit/pk-debug.h
@@ -43,6 +43,7 @@ G_BEGIN_DECLS
 #endif
 
 void		pk_debug_init			(gboolean	 debug);
+gboolean	pk_debug_enabled		(void);
 void		pk_debug_real			(const gchar	*func,
 						 const gchar	*file,
 						 int		 line,