More information available for fetch progress callbacks.

Better exception handling (we really shouldn't segfault on an exception).

1 files changed, 10 insertions, 4 deletions

diff --git a/doc/examples/progress.py b/doc/examples/progress.py
index 2231001f..f7650f69 100644
--- a/doc/examples/progress.py
+++ b/doc/examples/progress.py
@@ -34,14 +34,20 @@ class TextFetchProgress(apt.FetchProgress):
     def stop(self):
         pass
 
-    def updateStatus(self, uri, descr, shortDescr, status):
-        print "UpdateStatus: '%s' '%s' '%s' '%i'" % (
-            uri, descr, shortDescr, status)
+    def updateStatus(self, uri, descr, shortDescr, status, fileSize, 
+                     partialSize):
+        print "UpdateStatus: '%s' '%s' '%s' '%i' '%d/%d'" % (
+            uri, descr, shortDescr, status, partialSize, fileSize)
 
-    def pulse(self):
+    def pulse(self, items):
         print "Pulse: CPS: %s/s; Bytes: %s/%s; Item: %s/%s" % (
             apt.SizeToStr(self.currentCPS), apt.SizeToStr(self.currentBytes),
             apt.SizeToStr(self.totalBytes), self.currentItems, self.totalItems)
+        print "Pulse-Items: "
+        for itm in items:
+            uri, descr, shortDescr, fileSize, partialSize = itm
+            print " - '%s' '%s' '%s' '%d/%d'" % (
+                uri, descr, shortDescr, partialSize, fileSize
         return True
 
     def mediaChange(self, medium, drive):