diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-11-15 10:28:27 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-11-15 10:28:27 +0100 |
| commit | 58a642755c63cde3cf377d3719d66add27b13d65 (patch) | |
| tree | 92719b94ccca55b5e128f28e9499e1ec331a5440 /apt-pkg/depcache.cc | |
| parent | fd8bb61d2945d2e2f19f0e0a753129235717a9f3 (diff) | |
| parent | 3cf1e4b50a9bb439c4f54a631cfebbb6c4d1ea7d (diff) | |
merged from debian
Diffstat (limited to 'apt-pkg/depcache.cc')
| -rw-r--r-- | apt-pkg/depcache.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 0b5d6d8e6..23abc76c1 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1444,8 +1444,11 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, VerIterator Ver(*this,*I); PkgIterator Pkg = Ver.ParentPkg(); - - + /* The List includes all packages providing this dependency, + even providers which are not installed, so skip them. */ + if (PkgState[Pkg->ID].InstallVer == 0) + continue; + if (PkgState[Pkg->ID].CandidateVer != *I && Start->Type == Dep::DpkgBreaks) MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps); |