X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/09af1a917c739e50e4e8590cc8402525b3f1f64d..1979e742ad5e2a0b6e547fbe3f4c4066b5a9bd2e:/apt-pkg/deb/debindexfile.cc?ds=sidebyside diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index b3b77dad7..234521efe 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -158,17 +158,6 @@ debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section,bool Tr { } /*}}}*/ - -string debPackagesIndex::ArchiveURI(string File) const -{ - // FIXME: EVIL! Remove as soon as pdiff support is offical - string remap = _config->Find("APT::URL-Remap::"+URI,""); - if(!remap.empty()) - return remap+File; - - return URI + File; -} - // PackagesIndex::ArchiveInfo - Short version of the archive url /*{{{*/ // --------------------------------------------------------------------- /* This is a shorter version that is designed to be < 60 chars or so */ @@ -316,7 +305,7 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const pkgCache::PkgFileIterator File = Cache.FileBegin(); for (; File.end() == false; File++) { - if (FileName != File.FileName()) + if (File.FileName() == NULL || FileName != File.FileName()) continue; struct stat St;