Merge lp:~mvo/aptdaemon/longlong-progress into lp:aptdaemon

[Michael Vogt]

This make the types for bytes_{total,done} 64bit in order to follow the latest apt API change.

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2011-08-12 09:11:03 +0000
+++ aptdaemon/core.py	2011-08-19 14:34:25 +0000
@@ -330,8 +330,9 @@
         self.after = None
         self._role = dbus.String(role)
         self._progress = dbus.Int32(0)
+        # items_done, total_items, bytes_done, total_bytes, speed, time
         self._progress_details = dbus.Struct((0, 0, 0, 0, 0, 0),
-                                             signature="iiiiiii")
+                                             signature="iixxii")
         self._progress_download = dbus.Struct(("", "", "", 0L, 0L, ""),
                                               signature="sssxxs")
         self._exit = dbus.String(enums.EXIT_UNFINISHED)
@@ -454,7 +455,8 @@
     role = property(_get_role, _set_role, doc="Operation type of transaction.")
 
     def _set_progress_details(self, details):
-        self._progress_details = self._convert_struct(details, "iiiiii")
+        # items_done, total_items, bytes_done, total_bytes, speed, time
+        self._progress_details = self._convert_struct(details, "iixxii")
         self.PropertyChanged("ProgressDetails", self._progress_details)
 
     def _get_progress_details(self):
 
=== modified file 'doc/source/dbus.rst'
--- doc/source/dbus.rst	2011-07-28 11:56:59 +0000
+++ doc/source/dbus.rst	2011-08-19 14:34:25 +0000
@@ -291,7 +291,7 @@
 
     *read-only*
 
-.. attribute:: ProgressDetails : (iiiiii)
+.. attribute:: ProgressDetails : (iixxii)
 
     A list with detailed progress information: