* merged from apt--mvo

[apt.git] / apt-pkg / deb / debindexfile.cc

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index e2ed868902d6bd6fbba6c0b71acc556ecade5f47..9f435bba55dc4df5da75afa718e6f9149aeab6a3 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -305,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;
@@ -338,23 +338,15 @@ inline string debTranslationsIndex::IndexFile(const char *Type) const
 string debTranslationsIndex::IndexURI(const char *Type) const
 {
    string Res;
-
-   string theURI = URI;
-   // FIXME: EVIL! Remove as soon as pdiff support is offical
-   string remap = _config->Find("DDTP::URL-Remap::"+URI,"");
-   if(!remap.empty())
-      theURI = remap;
-
-
    if (Dist[Dist.size() - 1] == '/')
    {
       if (Dist != "/")
-        Res = theURI + Dist;
+        Res = URI + Dist;
       else 
-        Res = theURI;
+        Res = URI;
    }
    else
-      Res = theURI + "dists/" + Dist + '/' + Section +
+      Res = URI + "dists/" + Dist + '/' + Section +
       "/i18n/Translation-";
    
    Res += Type;