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

[Richard Hughes]

 backends/dummy/pk-backend-dummy.c |    2 +-
 html/pk-faq.html                  |    8 ++++----
 src/pk-engine.c                   |    5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 175e55e83dceec125580bb3117fcb44136d0b56f
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Nov 12 19:14:25 2007 +0000

    update conary backend status for the website

diff --git a/html/pk-faq.html b/html/pk-faq.html
index 5182cfa..dc1850a 100644
--- a/html/pk-faq.html
+++ b/html/pk-faq.html
@@ -22,7 +22,7 @@
 <pre>
                   | conary | yum | apt | box | alpm | smart | pisi |
 --------------------------------------------------------------------
-resolve           |        |  X  |     |  X  |      |   X   |   X  |
+resolve           |   X    |  X  |     |  X  |      |   X   |   X  |
 refresh-cache     |   X    |  X  |  X  |  X  |      |   X   |   X  |
   \--force        |        |     |     |     |      |       |      |
 get-updates       |   X    |  X  |     |  X  |      |   X   |   X  |
@@ -34,18 +34,18 @@ search-group      |        |  X  |     |     |      |       |   X  |
 install-package   |   X    |  X  |     |  X  |  X   |   X   |   X  |
 install-file      |        |  X  |     |  X  |      |   X   |   X  |
 remove-package    |   X    |  X  |     |  X  |  X   |   X   |   X  |
-update-package    |        |  X  |     |  X  |      |   X   |   X  |
+update-package    |   X    |  X  |     |  X  |      |   X   |   X  |
 get-depends       |        |  X  |     |  X  |      |   X   |   X  |
   \--recursive    |        |     |     |     |      |       |      |
 get-requires      |   X    |  X  |     |  X  |      |       |   X  |
   \--recursive    |        |     |     |     |      |       |      |
 get-description   |   X    |  X  |  X  |  X  |      |   X   |   X  |
-get-files         |        |  X  |     |  X  |      |   X   |   X  |
+get-files         |   X    |  X  |     |  X  |      |   X   |   X  |
 get-update-detail |        |  X  |     |     |      |       |      |
 get-repo-list     |        |  X  |     |  X  |  X   |   X   |   X  |
 repo-enable       |        |  X  |     |  X  |      |   X   |      |
 repo-set-data     |        |  X  |     |  X  |      |       |   X  |
-cancel-transaction|        |  X  |     |     |      |       |   X  |
+cancel-transaction|   X    |  X  |     |     |      |       |   X  |
 </pre>
 
 <h4>Filters</h4>
commit eeec6de25dce5c466710ef74d3689d8b3cea6d6c
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Nov 12 19:00:07 2007 +0000

    emit the right thing from the dummy backend... ooops.

diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index b837d43..59109ac 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -390,7 +390,7 @@ static void
 backend_update_package (PkBackend *backend, const gchar *package_id)
 {
 	g_return_if_fail (backend != NULL);
-	pk_backend_package (backend, PK_INFO_ENUM_INSTALLED, package_id, "The same thing");
+	pk_backend_package (backend, PK_INFO_ENUM_INSTALLING, package_id, "The same thing");
 	pk_backend_updates_changed (backend);
 	pk_backend_finished (backend);
 }
commit 631e4c4d31d898e1ece2d2a7c815ffc6fb25e83f
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Nov 12 18:42:39 2007 +0000

    don't crash the daemon if the backend does crazy things, just warn and return

diff --git a/src/pk-engine.c b/src/pk-engine.c
index 48a52a0..4b87c31 100644
--- a/src/pk-engine.c
+++ b/src/pk-engine.c
@@ -296,8 +296,9 @@ pk_engine_package_cb (PkBackend *backend, PkInfoEnum info, const gchar *package_
 	    role == PK_ROLE_ENUM_INSTALL_PACKAGE ||
 	    role == PK_ROLE_ENUM_UPDATE_PACKAGE) {
 		if (info == PK_INFO_ENUM_INSTALLED) {
-			pk_error ("backend emitted 'installed' rather than 'installing' "
-				  "- you need to do the package *before* you do the action");
+			pk_warning ("backend emitted 'installed' rather than 'installing' "
+				    "- you need to do the package *before* you do the action");
+			return;
 		}
 	}