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

[Richard Hughes]

 backends/BACKENDS                  |    2 +-
 backends/box/pk-backend-box.c      |    4 ++--
 backends/yum/helpers/yumBackend.py |    4 ++--
 configure.ac                       |    4 +++-
 docs/pk-backends.xml               |    5 +++++
 html/pk-faq.html                   |    2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 2a42f97075b0ba522eda58d50b4e8a6ee2188a1a
Author: S.Çağlar Onur <caglar at pardus.org.tr>
Date:   Thu Oct 25 20:18:58 2007 +0300

    Add autodetection support for PiSi backend

diff --git a/configure.ac b/configure.ac
index 56a63c5..2448e31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,7 @@ dnl - Compile time default choice of backend
 dnl ---------------------------------------------------------------------------
 AC_ARG_WITH([default_backend],
 	    AS_HELP_STRING([--with-default-backend=<option>],
-			   [Default backend to use alpm,apt,box,conary,dummy,smart,yum (dummy)]))
+			   [Default backend to use alpm,apt,box,conary,dummy,smart,yum,pisi (dummy)]))
 # default to a sane option for the installed tool
 if test x$with_default_backend = x; then
 	if test -f /usr/bin/yum ; then
@@ -254,6 +254,8 @@ if test x$with_default_backend = x; then
 		with_default_backend=box
 	elif test -f /usr/bin/smart ; then
 		with_default_backend=smart
+	elif test -f /usr/bin/pisi ; then
+		with_default_backend=pisi
 	else
 		with_default_backend=dummy
 	fi
commit dca07dcc9e6a9ddf3dd1ed8afd2aef803018cc2b
Author: Grzegorz Dabrowski <gdx at o2.pl>
Date:   Thu Oct 25 19:06:20 2007 +0000

    [box] use all enabled repos

diff --git a/backends/box/pk-backend-box.c b/backends/box/pk-backend-box.c
index 12f6f8a..085a525 100644
--- a/backends/box/pk-backend-box.c
+++ b/backends/box/pk-backend-box.c
@@ -62,7 +62,7 @@ db_open()
 	sqlite3 *db;
 
 	db = box_db_open("/");
-	box_db_attach_repo(db, "/", "core");
+	box_db_attach_repos(db, "/");
 	box_db_repos_init(db);
 
 	return db;
@@ -71,7 +71,7 @@ db_open()
 static void
 db_close(sqlite3 *db)
 {
-	box_db_detach_repo(db, "core");
+	box_db_detach_repos(db);
 	box_db_close(db);
 }
 
commit b8ff26cc957b0ac7d2ce3bc81e478e38f3e5b63f
Author: James Bowes <jbowes at dangerouslyinc.com>
Date:   Thu Oct 25 08:50:06 2007 -0400

    yum: Display license in get-description.

diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index 4e4cd71..e65bcbe 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -689,8 +689,8 @@ class PackageKitYumBackend(PackageKitBaseBackend):
 
             file_list = ";".join(files)
 
-            self.description(id, "%s-%s" % (pkg.version, pkg.release),
-                                 "unknown", desc, pkg.url, pkg.size, file_list)
+            self.description(id, pkg.license, "unknown", desc, pkg.url,
+                             pkg.size, file_list)
         else:
             self.error(ERROR_INTERNAL_ERROR,'Package was not found')
 
commit ca01abad19c2f2b7e80cba2ecb1ccd2a49a9acb1
Author: S.Çağlar Onur <caglar at pardus.org.tr>
Date:   Thu Oct 25 13:37:27 2007 +0300

    PiSi: Update backend status

diff --git a/backends/BACKENDS b/backends/BACKENDS
index abc1228..a9bd437 100644
--- a/backends/BACKENDS
+++ b/backends/BACKENDS
@@ -21,5 +21,5 @@ get-update-detail |        |     |     |     |      |       |      |
 get-repo-list     |        |  X  |     |  X  |  X   |       |   X  |
 repo-enable       |        |  X  |     |     |      |       |      |
 repo-set-data     |        |     |     |     |      |       |      |
-cancel-transaction|        |     |     |     |      |       |      |
+cancel-transaction|        |     |     |     |      |       |   X  |
 
diff --git a/html/pk-faq.html b/html/pk-faq.html
index ac637f1..8845218 100644
--- a/html/pk-faq.html
+++ b/html/pk-faq.html
@@ -44,7 +44,7 @@ get-update-detail |        |     |     |     |      |       |      |
 get-repo-list     |        |  X  |     |     |  X   |       |   X  |
 repo-enable       |        |  X  |     |     |      |       |      |
 repo-set-data     |        |     |     |     |      |       |      |
-cancel-transaction|        |     |     |     |      |       |      |
+cancel-transaction|        |     |     |     |      |       |   X  |
 </pre>
 
 <h3>What if the backend package manager doesn't support percentage updates?</h3>
commit 72f99f260dab76519f17566cf98a19f73cb5b475
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Oct 25 07:51:29 2007 +0100

    add AllowUpdate into the docs

diff --git a/docs/pk-backends.xml b/docs/pk-backends.xml
index da849c6..4f1f9d4 100644
--- a/docs/pk-backends.xml
+++ b/docs/pk-backends.xml
@@ -172,6 +172,11 @@
             <entry><literal>stderr</literal></entry>
           </row>
           <row>
+            <entry>AllowUpdate</entry>
+            <entry><literal>allow-interrupt[tab]enabled</literal></entry>
+            <entry><literal>stderr</literal></entry>
+          </row>
+          <row>
             <entry>Package</entry>
             <entry><literal>package_id[tab]status[tab]package_id[tab]summary</literal></entry>
             <entry><literal>stdout</literal></entry>