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

[Richard Hughes]

 docs/api/Makefile.am   |    2 +-
 policy/Makefile.am     |    2 ++
 src/pk-backend-spawn.c |    3 +++
 src/pk-backend.c       |    5 ++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 7ccadfcd9992f74f1dc35070693f44d7292ee436
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Feb 13 23:09:07 2008 +0000

    surround POLKIT_POLICY_FILE_VALIDATE with SECURITY_TYPE_POLKIT as we don't want to run this on the dummy target

diff --git a/policy/Makefile.am b/policy/Makefile.am
index 2f43804..97470f4 100644
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -10,8 +10,10 @@ EXTRA_DIST =					\
 	$(polkit_DATA)				\
 	$(NULL)
 
+if SECURITY_TYPE_POLKIT
 check:
 	$(POLKIT_POLICY_FILE_VALIDATE) $(top_srcdir)/policy/$(polkit_DATA)
+endif
 
 clean-local :
 	rm -f *~
commit e1d1165f807a40430bffba56c7f5fa960c293db1
Merge: 5496ee3... cdbb5dd...
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Feb 13 23:05:10 2008 +0000

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

commit cdbb5dd52161eb0873944f04159fe77bcac89127
Author: Thomas Wood <thomas at openedhand.com>
Date:   Wed Feb 13 22:59:57 2008 +0000

    docs: Add version.xml to content_files to fix distcheck

diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 9f94975..5854381 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -42,7 +42,7 @@ IGNORE_HFILES = \
 HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-content_files=
+content_files = version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
commit 5496ee3f307867b4c0410570d4444f802b7f25a6
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Feb 13 22:55:27 2008 +0000

    assign the backend so we don't assert when make check when we call cancel on an invalid backend

diff --git a/src/pk-backend-spawn.c b/src/pk-backend-spawn.c
index 80455e1..04afc74 100644
--- a/src/pk-backend-spawn.c
+++ b/src/pk-backend-spawn.c
@@ -758,6 +758,9 @@ libst_backend_spawn (LibSelfTest *test)
 		libst_failed (test, "did not validate correctly");
 	}
 
+	/* needed to avoid an error */
+	pk_backend_set_name (backend_spawn->priv->backend, "dummy");
+
 	/************************************************************/
 	libst_title (test, "test pk_backend_spawn_parse_common_error AllowUpdate1");
 	ret = pk_backend_spawn_parse_common_error (backend_spawn, "allow-cancel\ttrue");
commit 6e6e5395c31ab04fdef34845879ad21f2c745a7e
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Feb 13 22:44:37 2008 +0000

    add some assertions for unprotected description objects

diff --git a/src/pk-backend.c b/src/pk-backend.c
index 7b19841..43df9ab 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -189,6 +189,7 @@ pk_backend_unlock (PkBackend *backend)
 {
 	g_return_val_if_fail (backend != NULL, FALSE);
 	g_return_val_if_fail (PK_IS_BACKEND (backend), FALSE);
+	g_return_val_if_fail (backend->desc != NULL, FALSE);
 
 	if (backend->priv->locked == FALSE) {
 		pk_warning ("already unlocked");
@@ -628,6 +629,7 @@ pk_backend_set_allow_cancel (PkBackend *backend, gboolean allow_cancel)
 {
 	g_return_val_if_fail (backend != NULL, FALSE);
 	g_return_val_if_fail (PK_IS_BACKEND (backend), FALSE);
+	g_return_val_if_fail (backend->desc != NULL, FALSE);
 
 	/* remove or add the hal inhibit */
 	if (allow_cancel == TRUE) {
@@ -797,6 +799,7 @@ pk_backend_get_backend_detail (PkBackend *backend, gchar **name, gchar **author)
 {
 	g_return_val_if_fail (backend != NULL, FALSE);
 	g_return_val_if_fail (PK_IS_BACKEND (backend), FALSE);
+	g_return_val_if_fail (backend->desc != NULL, FALSE);
 
 	if (name != NULL && backend->desc->description != NULL) {
 		*name = g_strdup (backend->desc->description);
commit 37c2f2c442ac7a3ed0b5f813370e895001bc94c1
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Feb 13 22:39:04 2008 +0000

    bahh, yum2 now exists and makes the self check fail

diff --git a/src/pk-backend.c b/src/pk-backend.c
index 2815fb7..7b19841 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -1052,7 +1052,7 @@ libst_backend (LibSelfTest *test)
 
 	/************************************************************/
 	libst_title (test, "load an invalid backend");
-	ret = pk_backend_set_name (backend, "yum2");
+	ret = pk_backend_set_name (backend, "invalid");
 	if (ret == FALSE) {
 		libst_success (test, NULL);
 	} else {