From edbda33bdef6a480fcfcb5d6b9a219c10cbeaaba Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Nov 2010 13:26:37 +0100 Subject: * apt-pkg/depcache.cc: - don't install previously not installed providers in a try to statisfy a "Breaks: provides" dependency by upgrade --- apt-pkg/depcache.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'apt-pkg') 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); -- cgit v1.2.3