summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt/debfile.py1
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 0 deletions
diff --git a/apt/debfile.py b/apt/debfile.py
index 2eb807b8..1ebbea32 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -104,6 +104,7 @@ class DebPackage(object):
elif self._cache.is_virtual_package(pkgname):
return pkgname
elif (pkgname in self._cache and
+ self._cache[pkgname].candidate and
self._cache[pkgname].candidate.architecture == "all"):
return pkgname
# now do the real multiarch checking
diff --git a/debian/changelog b/debian/changelog
index 161cacfd..b0ca3efd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ python-apt (0.8.8) UNRELEASED; urgency=low
* merged lp:~sampo555/python-apt/fix_1042916 reuse existing but
disabled sources.list entries instead of duplicating them.
Thanks to "sampo555", LP: #1042916
+ * lp:~mvo/python-apt/fix-debfile-crash:
+ - fix crash on missing candidates in the multiarch check
[ James Hunt ]
* python/cache.cc: PkgCacheGetIsMultiArch(): Return calculated