diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2011-05-17 18:14:25 +0200 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-05-17 18:14:25 +0200 |
commit | 894d672e9b7517573266cda333612e70441cbda8 (patch) | |
tree | f4c76670bcd9048188968bb2c5d962e3a6238026 /apt-pkg/cacheiterators.h | |
parent | 98278a81bf554246b70b97852c9b8b92eac390ea (diff) |
* apt-pkg/pkgcache.h:
- clean up mess with the "all" handling in MultiArch to
fix LP: #733741 cleanly for everyone now
Diffstat (limited to 'apt-pkg/cacheiterators.h')
-rw-r--r-- | apt-pkg/cacheiterators.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 0c9813c6d..535253099 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -206,9 +206,7 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; inline const char *Arch() const { - if (S->MultiArch == pkgCache::Version::All || - S->MultiArch == pkgCache::Version::AllForeign || - S->MultiArch == pkgCache::Version::AllAllowed) + if (S->MultiArch == pkgCache::Version::All) return "all"; return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; }; |