From 06805303f9029f394813469a3bd243f9e4837ede Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Apr 2010 17:47:39 +0200 Subject: merged -r 396..397 from the debian-sid branch --- debian/changelog | 10 ++++++++++ python/cache.cc | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bf22d3d8..730c3954 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-apt (0.7.94.2ubuntu5) UNRELEASEDlucid; urgency=low + + Cherry pick fix from the debian branch: + + [ Julian Andres Klode ] + * python/cache.cc: + - Fix PackageFile.not_automatic to use NotAutomatic instead of NotSource. + + -- Michael Vogt Wed, 14 Apr 2010 17:45:11 +0200 + python-apt (0.7.94.2ubuntu5) lucid; urgency=low [ Julian Andres Klode ] diff --git a/python/cache.cc b/python/cache.cc index 87902b1e..515f0193 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -968,7 +968,7 @@ static PyObject *PackageFile_GetNotSource(PyObject *Self,void*) static PyObject *PackageFile_GetNotAutomatic(PyObject *Self,void*) { pkgCache::PkgFileIterator &File = GetCpp(Self); - return Py_BuildValue("i",(File->Flags & pkgCache::Flag::NotSource) != 0); + return PyBool_FromLong((File->Flags & pkgCache::Flag::NotAutomatic) != 0); } static PyObject *PackageFile_GetID(PyObject *Self,void*) -- cgit v1.2.3