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

[Richard Hughes]

 backends/conary/helpers/conaryCallback.py |    6 ++++++
 configure.ac                              |    2 +-
 python/pkt                                |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
diff-tree 87f8e8709297c1f403463f6d2e132d01fb105ab8 (from parents)
Merge: 3721b8259149185ce3aa54c51af15e2ae75aa017 31b8aee63fb49da62309fbe08e91f9e940ec274a
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Sep 24 22:53:01 2007 +0100

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

diff-tree 31b8aee63fb49da62309fbe08e91f9e940ec274a (from parents)
Merge: b906e630f7fe3503333f4f4f19b0b9a1eaf116dc 109f98083d258d9a5ac898a9b2c3a84358c4326e
Author: Elliot Peele <elliot at bentlogic.net>
Date:   Mon Sep 24 17:43:20 2007 -0400

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

diff-tree b906e630f7fe3503333f4f4f19b0b9a1eaf116dc (from cef20b30610c8789ac25d5dfd72a2faa1ed0a2be)
Author: Elliot Peele <elliot at bentlogic.net>
Date:   Mon Sep 24 17:43:09 2007 -0400

    add overall percentages for small jobs

diff --git a/backends/conary/helpers/conaryCallback.py b/backends/conary/helpers/conaryCallback.py
index fb38da5..4aece7b 100644
--- a/backends/conary/helpers/conaryCallback.py
+++ b/backends/conary/helpers/conaryCallback.py
@@ -42,6 +42,9 @@ class UpdateCallback(callbacks.UpdateCal
             sub_percent = (add + troveNum) / (2 * float(troveCount)) * 100
             self.backend.sub_percentage(sub_percent)
 
+            if self.smallUpdate:
+                self.backend.percentage(sub_percent)
+
         if troveNum != 0:
             troveNum -= 1
 
@@ -72,6 +75,8 @@ class UpdateCallback(callbacks.UpdateCal
         if hunk > 0 and hunkCount > 0:
             percentage = hunk / float(hunkCount) * 100.0
             self.backend.percentage(percentage)
+        else:
+            self.smallUpdate = True
 
     def setUpdateJob(self, job):
         self.currentJob = job
@@ -95,3 +100,4 @@ class UpdateCallback(callbacks.UpdateCal
 
         self.backend = backend
         self.currentJob = None
+        self.smallUpdate = False
diff-tree 109f98083d258d9a5ac898a9b2c3a84358c4326e (from cef20b30610c8789ac25d5dfd72a2faa1ed0a2be)
Author: Robin Norwood <rnorwood at redhat.com>
Date:   Mon Sep 24 17:36:27 2007 -0400

    Renaming PackageKit python module to packagekit per http://www.python.org/dev/peps/pep-0008/

diff --git a/configure.ac b/configure.ac
index 8960710..32ddc71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AM_PROG_LIBTOOL
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 AM_PATH_PYTHON
-PYTHON_PACKAGE_DIR=${pythondir}/PackageKit
+PYTHON_PACKAGE_DIR=${pythondir}/packagekit
 AC_SUBST(PYTHON_PACKAGE_DIR)
 
 
diff --git a/python/pkt b/python/pkt
index 28e9a5b..ab8b71b 100755
--- a/python/pkt
+++ b/python/pkt
@@ -17,7 +17,7 @@ from sys import argv,exit
 from optparse import OptionParser
 from types import FunctionType
 
-from PackageKit import *
+from packagekit import *
 
 class pkt(PackageKit):
 	def Percentage(self,progress):