Merge lp:~evfool/aptdaemon/fixoverflow into lp:aptdaemon

[Robert Roth]

I am proposing to change the type of the Download and Space transaction properties from Int32 to Int64, to reduce the number of OverflowErrors happening with large Installed-Size properties from control files (see bug #771678 and bug #758837). I have made the changes, changed the API docs to match it, and I have tested the solution with test_worker.py and test_dbus_types, and all tests were successful. Also tested installing a package which failed to install before the fix due to an OverflowError, and after the fix, it has been installed successfully.

[Michael Vogt (mvo)]

This looks fine to me. I'm happy to merge this into trunk if Sebastian has no objections.

review: Approve

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2011-04-15 08:16:25 +0000
+++ aptdaemon/core.py	2011-06-27 08:18:28 +0000
@@ -174,6 +174,8 @@
                     attrib["type"] = "s"
                 elif isinstance(value, dbus.Int32):
                     attrib["type"] = "i"
+                elif isinstance(value, dbus.Int64):
+                    attrib["type"] = "x"
                 elif isinstance(value, dbus.Boolean):
                     attrib["type"] = "b"
                 elif isinstance(value, dbus.Struct):
@@ -183,7 +185,7 @@
                 elif isinstance(value, dbus.Array):
                     attrib["type"] = "a%s" % value.signature
                 else:
-                    raise Exception("Type %s of property %s in't " \
+                    raise Exception("Type %s of property %s isn't " \
                                     "convertable" % (type(value), key))
                 iface.append(ElementTree.Element("property", attrib))
         new_data = ElementTree.tostring(xml, encoding="UTF-8")
@@ -345,8 +347,8 @@
         self.cancelled = dbus.Boolean(False)
         self.paused = dbus.Boolean(False)
         self._meta_data = dbus.Dictionary(signature="sv")
-        self._download = dbus.Int32(0)
-        self._space = dbus.Int32(0)
+        self._download = dbus.Int64(0)
+        self._space = dbus.Int64(0)
         self._depends = dbus.Struct([dbus.Array([], signature='s') \
                                      for i in range(7)],
                                     signature="asasasasasasas")
@@ -497,7 +499,7 @@
         return self._download
 
     def _set_download(self, size):
-        self._download = dbus.Int32(size)
+        self._download = dbus.Int64(size)
         self.PropertyChanged("Download", self._download)
 
     download = property(_get_download, _set_download,
@@ -507,7 +509,7 @@
         return self._space
 
     def _set_space(self, size):
-        self._space = dbus.Int32(size)
+        self._space = dbus.Int64(size)
         self.PropertyChanged("Space", self._space)
 
     space = property(_get_space, _set_space,

=== modified file 'doc/source/dbus.rst'
--- doc/source/dbus.rst	2011-02-19 13:40:03 +0000
+++ doc/source/dbus.rst	2011-06-27 08:18:28 +0000
@@ -203,7 +203,7 @@
 
     *read-only*
 
-.. attribute:: Download : i
+.. attribute:: Download : x
 
     The required download size in Bytes.
 
@@ -331,7 +331,7 @@
     ``role-install-packages``.
     *read-only*
 
-.. attribute:: Space : i
+.. attribute:: Space : x
 
     The required disk space in Bytes. If disk spaces is freed the value will
     be negative.