From cb2cc9a9765a03c0970c525716c7267547828002 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Sep 2010 20:56:46 +0200 Subject: merge fix from Steven Chamberlain for crash in unattended-upgrades, many many thanks (closes: #596408) --- python/acquire-item.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python') diff --git a/python/acquire-item.cc b/python/acquire-item.cc index 4b7dc34d..abc773b5 100644 --- a/python/acquire-item.cc +++ b/python/acquire-item.cc @@ -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(), -- cgit v1.2.3 From 9c9e4973bc5051a75b8b6c4f94be20fef5e881df Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Sep 2010 21:21:50 +0200 Subject: * python/acquire-item.cc: - fix two more int -> long long change to follow the changes from libapt --- debian/changelog | 3 +++ python/acquire-item.cc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'python') diff --git a/debian/changelog b/debian/changelog index 6f7dccfc..e4f07bcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ python-apt (0.7.97.2) UNRELEASED; urgency=low Sebastian Heinlein, LP: #642936 * merge fix from Steven Chamberlain 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 Fri, 27 Aug 2010 11:22:23 +0200 diff --git a/python/acquire-item.cc b/python/acquire-item.cc index abc773b5..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) -- cgit v1.2.3