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

[Richard Hughes]

 backends/conary/helpers/conaryBackend.py |    2 +-
 libpackagekit/pk-enum.c                  |    2 +-
 libpackagekit/pk-enum.h                  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree e04926a0d9daa49fd6d9ac5dbc94a3667a94ab59 (from 04d858db5b64997c8df6bbe40c15337d40637188)
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Sep 27 23:54:57 2007 +0100

    really re-arrange. sleep time

diff --git a/libpackagekit/pk-enum.h b/libpackagekit/pk-enum.h
index 86ad347..3959229 100644
--- a/libpackagekit/pk-enum.h
+++ b/libpackagekit/pk-enum.h
@@ -117,8 +117,8 @@ typedef enum {
 
 typedef enum {
 	PK_FREQ_ENUM_HOURLY,
-	PK_FREQ_ENUM_WEEKLY,
 	PK_FREQ_ENUM_DAILY,
+	PK_FREQ_ENUM_WEEKLY,
 	PK_FREQ_ENUM_NEVER,
 	PK_FREQ_ENUM_UNKNOWN
 } PkFreqEnum;
diff-tree 04d858db5b64997c8df6bbe40c15337d40637188 (from parents)
Merge: d3eead91277b13e8ca3cedf762a51ea767dde8b9 020552b4ced319c00e3ceec1e006ead7606ce51d
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Sep 27 23:42:33 2007 +0100

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

diff-tree d3eead91277b13e8ca3cedf762a51ea767dde8b9 (from 938516a1c62ceab52af454909d2edf238db5f606)
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Sep 27 23:42:23 2007 +0100

    make the order correct

diff --git a/libpackagekit/pk-enum.c b/libpackagekit/pk-enum.c
index b1f4597..c015a19 100644
--- a/libpackagekit/pk-enum.c
+++ b/libpackagekit/pk-enum.c
@@ -128,8 +128,8 @@ static PkTaskEnumMatch task_group[] = {
 
 static PkTaskEnumMatch task_freq[] = {
 	{PK_FREQ_ENUM_HOURLY,			"hourly"},
-	{PK_FREQ_ENUM_WEEKLY,			"weekly"},
 	{PK_FREQ_ENUM_DAILY,			"daily"},
+	{PK_FREQ_ENUM_WEEKLY,			"weekly"},
 	{PK_FREQ_ENUM_NEVER,			"never"},
 	{0, NULL},
 };
diff-tree 020552b4ced319c00e3ceec1e006ead7606ce51d (from 938516a1c62ceab52af454909d2edf238db5f606)
Author: Ken VanDine <ken at vandine.org>
Date:   Thu Sep 27 18:37:40 2007 -0400

    Use unknown for group

diff --git a/backends/conary/helpers/conaryBackend.py b/backends/conary/helpers/conaryBackend.py
index 677705f..15cd9fe 100644
--- a/backends/conary/helpers/conaryBackend.py
+++ b/backends/conary/helpers/conaryBackend.py
@@ -301,7 +301,7 @@ class PackageKitConaryBackend(PackageKit
             shortDesc = self._get_metadata(id, 'shortDesc') or name
             longDesc = self._get_metadata(id, 'longDesc') or ""
             url = "http://www.foresightlinux.org/packages/" + name + ".html"
-            categories = self._get_metadata(id, 'categories') or "other"
+            categories = self._get_metadata(id, 'categories') or "unknown"
             self.description(shortDesc, id, categories, longDesc, url)
         else:
             self.error(ERROR_INTERNAL_ERROR,'Package was not found')