X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b2e465d6d32d2dc884f58b94acb7e35f671a87fe..b647537ea313bfd026b10c531e3f7adc2aeb39f8:/apt-pkg/depcache.cc diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index d410413d4..814a1fb1b 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: depcache.cc,v 1.23 2001/02/20 07:03:17 jgg Exp $ +// $Id: depcache.cc,v 1.25 2001/05/27 05:36:04 jgg Exp $ /* ###################################################################### Dependency Cache - Caches Dependency information. @@ -182,6 +182,9 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) { StateCache &P = PkgState[Pkg->ID]; + if (Pkg->VersionList == 0) + return; + if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && P.Keep() == true) return; @@ -669,7 +672,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, succeed. We have already cached this.. */ for (; Ors > 1 && (DepState[Start->ID] & DepCVer) != DepCVer; Ors--) Start++; - + /* This bit is for processing the possibilty of an install/upgrade fixing the problem */ SPtrArray List = Start.AllTargets(); @@ -691,7 +694,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } // Select the highest priority providing package - if (InstPkg.end() == false) + if (InstPkg.end() == true) { pkgPrioSortList(*Cache,Cur); for (; *Cur != 0; Cur++)