diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-11-18 09:51:50 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-11-18 09:51:50 +0100 |
| commit | ee7077b0133711c879312f74303e8486a2bb865d (patch) | |
| tree | 1c9c74017fe14c9f92abade0a3b679e01e6c53c1 /apt-pkg/depcache.cc | |
| parent | 19a9616d1c19c4a053826585f969459d166e44f2 (diff) | |
| parent | 5c246b99204e8ef32243ae42c5ca3a2dee54e59b (diff) | |
merged from debian-sid
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 22043db08..72bdd3199 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1448,8 +1448,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); |