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

[Richard Hughes]

 backends/conary/helpers/conaryCallback.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
diff-tree 71eb1037fbdea6ab62da591761050ed04aafaff5 (from 9eee60b24c8613d68aef2d2a0d90adbeb2ffc4f6)
Author: Ken VanDine <ken at vandine.org>
Date:   Tue Oct 9 15:33:07 2007 -0400

    Fixed the callback to report the correct status

diff --git a/backends/conary/helpers/conaryCallback.py b/backends/conary/helpers/conaryCallback.py
index 5d167a2..cc578b7 100644
--- a/backends/conary/helpers/conaryCallback.py
+++ b/backends/conary/helpers/conaryCallback.py
@@ -63,14 +63,16 @@ class UpdateCallback(callbacks.UpdateCal
         if oldVersion and newVersion:
             self.backend.status(INFO_UPDATING)
             id = self.backend.get_package_id(name, newVersion, newFlavor)
+            self.backend.package(id, INFO_UPDATING, '')
         elif oldVersion and not newVersion:
             self.backend.status(INFO_REMOVING)
             id = self.backend.get_package_id(name, oldVersion, oldFlavor)
+            self.backend.package(id, INFO_REMOVING, '')
         elif not oldVersion and newVersion:
             self.backend.status(INFO_INSTALLING)
             id = self.backend.get_package_id(name, newVersion, newFlavor)
+            self.backend.package(id, INFO_INSTALLING, '')
 
-        self.backend.package(id, 1, '')
 
     def creatingDatabaseTransaction(self, troveNum, troveCount):
         self.preparingUpdate(troveNum, troveCount, add=troveCount)
diff-tree 9eee60b24c8613d68aef2d2a0d90adbeb2ffc4f6 (from 14d81c195462c0b22fe6eeffac3b1694247e384a)
Author: Ken VanDine <ken at vandine.org>
Date:   Tue Oct 9 15:18:42 2007 -0400

    Fixed an import

diff --git a/backends/conary/helpers/conaryCallback.py b/backends/conary/helpers/conaryCallback.py
index 9c7884b..5d167a2 100644
--- a/backends/conary/helpers/conaryCallback.py
+++ b/backends/conary/helpers/conaryCallback.py
@@ -10,7 +10,7 @@
 #
 
 from conary import callbacks
-from packagekit import *
+from packagekit.backend import *
 
 class UpdateCallback(callbacks.UpdateCallback):
     def resolvingDependencies(self):