diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-24 21:23:29 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-24 21:23:29 +0200 |
| commit | eafb17c880c643b7e9223e673e51d7ce5a10cef5 (patch) | |
| tree | 129c0a675c98f286d06caba47c9766d04383cc03 | |
| parent | ba81885de8c079e096d19e301c972426fc3e7366 (diff) | |
| parent | 9c9e4973bc5051a75b8b6c4f94be20fef5e881df (diff) | |
| download | python-apt-eafb17c880c643b7e9223e673e51d7ce5a10cef5.tar.gz | |
* merge fix from Steven Chamberlain <steven@pyro.eu.org> for
crash in unattended-upgrades, many many thanks (closes: #596408)
* python/acquire-item.cc:
- fix two more int -> long long change to follow the changes
from libapt
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | python/acquire-item.cc | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index f847f345..98f9091e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-apt (0.7.96.1ubuntu12) maverick; urgency=low + + * merge fix from Steven Chamberlain <steven@pyro.eu.org> for + crash in unattended-upgrades, many many thanks (closes: #596408) + * python/acquire-item.cc: + - fix two more int -> long long change to follow the changes + from libapt + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 24 Sep 2010 21:22:38 +0200 + python-apt (0.7.96.1ubuntu11) maverick; urgency=low * Fix return type of DebSize() and UsrSize(), its long long, diff --git a/python/acquire-item.cc b/python/acquire-item.cc index 4b7dc34d..377b077a 100644 --- a/python/acquire-item.cc +++ b/python/acquire-item.cc @@ -65,7 +65,7 @@ static PyObject *acquireitem_get_error_text(PyObject *self, void *closure) static PyObject *acquireitem_get_filesize(PyObject *self, void *closure) { pkgAcquire::Item *item = acquireitem_tocpp(self); - return item ? Py_BuildValue("i", item->FileSize) : 0; + return item ? Py_BuildValue("K", item->FileSize) : 0; } static PyObject *acquireitem_get_id(PyObject *self, void *closure) @@ -95,7 +95,7 @@ static PyObject *acquireitem_get_local(PyObject *self, void *closure) static PyObject *acquireitem_get_partialsize(PyObject *self, void *closure) { pkgAcquire::Item *item = acquireitem_tocpp(self); - return item ? Py_BuildValue("i", item->PartialSize) : 0; + return item ? Py_BuildValue("K", item->PartialSize) : 0; } static PyObject *acquireitem_get_status(PyObject *self, void *closure) @@ -162,7 +162,7 @@ static PyObject *acquireitem_repr(PyObject *Self) return 0; return PyString_FromFormat("<%s object: " "Status: %i Complete: %i Local: %i IsTrusted: %i " - "FileSize: %lu DestFile:'%s' " + "FileSize: %llu DestFile:'%s' " "DescURI: '%s' ID:%lu ErrorText: '%s'>", Self->ob_type->tp_name, Itm->Status, Itm->Complete, Itm->Local, Itm->IsTrusted(), |