diff options
| author | Michael Vogt <mvo@debian.org> | 2010-09-24 21:27:54 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2010-09-24 21:27:54 +0200 |
| commit | b1cc657924729fba2288f1f79b7ad7b091b709f6 (patch) | |
| tree | 180987147138eb9e073785f0f491442fd3b46252 | |
| parent | b5be0185f39aa90b86d13848531173c7ebed6b7b (diff) | |
| parent | 9c9e4973bc5051a75b8b6c4f94be20fef5e881df (diff) | |
| download | python-apt-b1cc657924729fba2288f1f79b7ad7b091b709f6.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 | 5 | ||||
| -rw-r--r-- | python/acquire-item.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index a4358ec6..d9f6c7f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,11 @@ python-apt (0.7.98) UNRELEASED; urgency=low - support non-official templates (like extras.ubuntu.com) * fix return type of DebSize() and UsrSize(), thanks to Sebastian Heinlein, LP: #642936 + * 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 [ Kiwinote ] * apt/debfile: 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(), |