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

[Richard Hughes]

 backends/smart/helpers/smartBackend.py |    3 +++
 docs/pk-introduction.xml               |    7 +++++++
 libpackagekit/pk-enum.c                |    1 +
 libpackagekit/pk-enum.h                |    1 +
 python/packagekit/backend.py           |    2 +-
 tools/add-error-enum.sh                |    2 +-
 6 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 190a0708987db020d2296680dbeac80ce187a7d7
Merge: c693fa5... 299521d...
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Oct 23 14:53:50 2007 +0100

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

commit c693fa562d7c0718637b65e9a6847a0b64c7b89b
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Oct 23 14:53:20 2007 +0100

    add the CANNOT_REMOVE_SYSTEM_PACKAGE error type

diff --git a/docs/pk-introduction.xml b/docs/pk-introduction.xml
index 4979c8e..ab84f4e 100644
--- a/docs/pk-introduction.xml
+++ b/docs/pk-introduction.xml
@@ -326,6 +326,13 @@
               <entry><literal>repo-not-found</literal></entry>
               <entry>The repository name could not be found</entry>
             </row>
+            <row>
+              <entry><literal>cannot-remove-system-package</literal></entry>
+              <entry>
+                Could not remove a protected system package that is needed for
+                stable operation of the system.
+              </entry>
+            </row>
           </tbody>
         </tgroup>
       </informaltable>
diff --git a/libpackagekit/pk-enum.c b/libpackagekit/pk-enum.c
index 63a016f..7bee18e 100644
--- a/libpackagekit/pk-enum.c
+++ b/libpackagekit/pk-enum.c
@@ -99,6 +99,7 @@ static PkTaskEnumMatch task_error[] = {
 	{PK_ERROR_ENUM_DEP_RESOLUTION_FAILED,	"dep-resolution-failed"},
 	{PK_ERROR_ENUM_CREATE_THREAD_FAILED,	"create-thread-failed"},
 	{PK_ERROR_ENUM_REPO_NOT_FOUND,		"repo-not-found"},
+	{PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE,	"cannot-remove-system-package"},
 	{0, NULL},
 };
 
diff --git a/libpackagekit/pk-enum.h b/libpackagekit/pk-enum.h
index 9673685..d5273af 100644
--- a/libpackagekit/pk-enum.h
+++ b/libpackagekit/pk-enum.h
@@ -107,6 +107,7 @@ typedef enum {
 	PK_ERROR_ENUM_TRANSACTION_ERROR,
 	PK_ERROR_ENUM_NO_CACHE,
 	PK_ERROR_ENUM_REPO_NOT_FOUND,
+	PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE,
 	PK_ERROR_ENUM_UNKNOWN
 } PkErrorCodeEnum;
 
diff --git a/python/packagekit/backend.py b/python/packagekit/backend.py
index 216a965..75dcf78 100644
--- a/python/packagekit/backend.py
+++ b/python/packagekit/backend.py
@@ -41,7 +41,7 @@ ERROR_TRANSACTION_ERROR = "transaction-error"
 ERROR_TRANSACTION_ERROR = "transaction-error"
 ERROR_NO_CACHE = "no-cache"
 ERROR_REPO_NOT_FOUND = "repo-not-found"
-
+ERROR_CANNOT_REMOVE_SYSTEM_PACKAGE = "cannot-remove-system-package"
 
 STATE_DOWNLOAD = "download"
 STATE_INSTALL = "install"
diff --git a/tools/add-error-enum.sh b/tools/add-error-enum.sh
index 35131fa..a5c0ade 100755
--- a/tools/add-error-enum.sh
+++ b/tools/add-error-enum.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-$EDITOR docs/pk-introduction.xml libpackagekit/pk-enum.h libpackagekit/pk-enum.c ../gnome-packagekit/src/pk-common-gui.c backends/yum/helpers/packagekit.py
+$EDITOR docs/pk-introduction.xml libpackagekit/pk-enum.h libpackagekit/pk-enum.c ../gnome-packagekit/src/pk-common-gui.c python/packagekit/backend.py
 
commit 299521d0f707d691e201e0f8ff871c404f95c787
Author: James Bowes <jbowes at dangerouslyinc.com>
Date:   Tue Oct 23 09:18:12 2007 -0400

    smart: pulse progress bar for all operations

diff --git a/backends/smart/helpers/smartBackend.py b/backends/smart/helpers/smartBackend.py
index 18de83c..2b6565b 100644
--- a/backends/smart/helpers/smartBackend.py
+++ b/backends/smart/helpers/smartBackend.py
@@ -29,6 +29,9 @@ class PackageKitSmartBackend(PackageKitBaseBackend):
         self.ctrl.reloadChannels()
         self.ctrl.getCache()
 
+        # FIXME: Only pulsing progress for now.
+        self.percentage(None)
+
     def remove(self, allowdeps, packageid):
 
         idparts = packageid.split(';')