diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-06 07:10:38 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-06 07:10:38 +0100 |
| commit | ea9e09ef91f688a85d3e04d31163cfe0ef09c59c (patch) | |
| tree | 24b08faab3b3f291ec0521be16feffc526c607bf /apt-pkg | |
| parent | 446551c8ffd2c9cb9dcd707c94590e73009f7dd9 (diff) | |
| parent | 0dfc7eef47519bd6b48ceaa4341b72ec40560988 (diff) | |
| download | apt-ea9e09ef91f688a85d3e04d31163cfe0ef09c59c.tar.gz | |
Merge remote-tracking branch 'mvo/bugfix/multiarch-upgrade' into debian/sid
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/depcache.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 7e75a6fe3..c39e8c628 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1258,6 +1258,11 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if (PkgState[Pkg->ID].InstallVer == 0) continue; + /* Ignore negative dependencies that we are not going to + get installed */ + if (PkgState[Pkg->ID].InstallVer != *I) + continue; + if ((Start->Version != 0 || TrgPkg != Pkg) && PkgState[Pkg->ID].CandidateVer != PkgState[Pkg->ID].InstallVer && PkgState[Pkg->ID].CandidateVer != *I && |