summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-10-01 13:31:17 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-10-01 13:31:17 +0200
commitd3d4d322614a44cf84a6f2b40bc21d09bbfb2405 (patch)
tree9222faeda2219230ea9553a00e8f66c2086683ba
parentdc65d59dc294bafcd93dbadd848152736ddc11c5 (diff)
parente1c3b6b4d481998a8656952bcc3f6bbacd681515 (diff)
downloadpython-apt-d3d4d322614a44cf84a6f2b40bc21d09bbfb2405.tar.gz
merged lp:~jamesodhunt/python-apt/fix-for-PkgCacheGetIsMultiArch
-rw-r--r--debian/changelog6
-rw-r--r--python/cache.cc2
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 1bce9b1b..161cacfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,11 @@ python-apt (0.8.8) UNRELEASED; urgency=low
disabled sources.list entries instead of duplicating them.
Thanks to "sampo555", LP: #1042916
- -- David Prévot <taffit@debian.org> Wed, 08 Aug 2012 12:05:52 -0400
+ [ James Hunt ]
+ * python/cache.cc: PkgCacheGetIsMultiArch(): Return calculated
+ value rather than a random one.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 01 Oct 2012 13:30:53 +0200
python-apt (0.8.7) unstable; urgency=low
diff --git a/python/cache.cc b/python/cache.cc
index c51bd4af..10561ca0 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -286,7 +286,7 @@ static PyObject *PkgCacheGetFileList(PyObject *Self, void*) {
static PyObject *PkgCacheGetIsMultiArch(PyObject *Self, void*) {
pkgCache *Cache = GetCpp<pkgCache *>(Self);
- PyBool_FromLong(Cache->MultiArchCache());
+ return PyBool_FromLong(Cache->MultiArchCache());
}
static PyGetSetDef PkgCacheGetSet[] = {