diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2012-06-11 02:06:40 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-06-11 02:06:40 +0200 |
| commit | 0f485ee50e9bcd75a93f24b632280b5bcc078141 (patch) | |
| tree | dfc7cd18bdd2a35b430a6cd7a2f6874e28cd7849 /apt-pkg/pkgcache.cc | |
| parent | d5648746d4d4ea3f71aae5578a42050385e7b61d (diff) | |
* apt-pkg/deb/deblistparser.cc:
- add support for arch-specific qualifiers in dependencies
Diffstat (limited to 'apt-pkg/pkgcache.cc')
| -rw-r--r-- | apt-pkg/pkgcache.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index e06e74579..f694a237e 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -715,7 +715,10 @@ bool pkgCache::DepIterator::IsIgnorable(PrvIterator const &Prv) const sometimes it is needed to identify these to ignore them… */ bool pkgCache::DepIterator::IsMultiArchImplicit() const { - if (ParentPkg()->Arch != TargetPkg()->Arch) + if (ParentPkg()->Arch != TargetPkg()->Arch && + (S->Type == pkgCache::Dep::Replaces || + S->Type == pkgCache::Dep::DpkgBreaks || + S->Type == pkgCache::Dep::Conflicts)) return true; return false; } |