X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/8d4b705ab0ef3a0de13a9ff9f1aa47f09112f374..67800c687ec780bd5cf076af88bc4f2d96adbdfe:/apt-inst/extract.cc diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index 85363b9a1..29e163028 100644 --- a/apt-inst/extract.cc +++ b/apt-inst/extract.cc @@ -44,9 +44,12 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include + #include #include #include +#include #include #include @@ -372,7 +375,6 @@ bool pkgExtract::HandleOverwrites(pkgFLCache::NodeIterator Nde, pkgFLCache::NodeIterator TmpNde = Nde; unsigned long DiverOwner = 0; unsigned long FileGroup = Nde->File; - const char *FirstOwner = 0; for (; Nde.end() == false && FileGroup == Nde->File; Nde++) { if ((Nde->Flags & pkgFLCache::Node::Diversion) != 0) @@ -392,8 +394,7 @@ bool pkgExtract::HandleOverwrites(pkgFLCache::NodeIterator Nde, if something has already been diverted by this diversion */ if (FPkg.Offset() == DiverOwner) continue; - FirstOwner = FPkg.Name(); - + // Now see if this package matches one in a replace depends pkgCache::DepIterator Dep = Ver.DependsList(); bool Ok = false;