diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-10-01 16:34:03 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-10-01 16:34:03 +0200 |
| commit | 962e6a9e929c33401ed954b861ba65edf7141837 (patch) | |
| tree | c31dc4494f082cac78291a8d4b81d14dd4c85c38 | |
| parent | d3d4d322614a44cf84a6f2b40bc21d09bbfb2405 (diff) | |
| parent | 04ea8dd93af2c59fd58745e0aad6907307bb3047 (diff) | |
| download | python-apt-962e6a9e929c33401ed954b861ba65edf7141837.tar.gz | |
* lp:~mvo/python-apt/fix-debfile-crash:
- fix crash on missing candidates in the multiarch check
| -rw-r--r-- | apt/debfile.py | 1 | ||||
| -rw-r--r-- | debian/changelog | 2 |
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 |