* fixed a problem when it comes to the cache rebuilding

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index b8435a6bc29e055928d45a98f3f3060c28bd4c39..67fddfbd42f8468310ea0079d2412a854c35b388 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -458,20 +458,21 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const
 /* */
 pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const
 {
 /* */
 pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const
 {

+   string FileName = TranslationFile();
+

    pkgCache::PkgFileIterator File = Cache.FileBegin();
    pkgCache::PkgFileIterator File = Cache.FileBegin();

-   if (this->UseTranslation()) 
-     for (; File.end() == false; File++)
-       {
-        if (IndexFile(LanguageCode().c_str()) != File.FileName())
-          continue;
+   for (; File.end() == false; File++)
+   {
+      if (FileName != File.FileName())
+        continue;

       
       

-        struct stat St;
-        if (stat(File.FileName(),&St) != 0)
-          return pkgCache::PkgFileIterator(Cache);
-        if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
-          return pkgCache::PkgFileIterator(Cache);
-        return File;
-       }   
+      struct stat St;
+      if (stat(File.FileName(),&St) != 0)
+        return pkgCache::PkgFileIterator(Cache);
+      if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
+        return pkgCache::PkgFileIterator(Cache);
+      return File;
+   }   

    return File;
 }
                                                                        /*}}}*/
    return File;
 }
                                                                        /*}}}*/

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 6d423318e7296a3fdd5477b624c1cb295829f3ec..02c776882f1159a61bf4ac43d0126d4477cbe35f 100644 (file)
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -96,7 +96,7 @@ class debTranslationsIndex : public pkgIndexFile
    
    // Interface for the Cache Generator
    virtual bool Exists() const;
    
    // Interface for the Cache Generator
    virtual bool Exists() const;

-   virtual bool HasPackages() const {return true;};
+   virtual bool HasPackages() const { return UseTranslation();};

    virtual unsigned long Size() const;
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
    virtual unsigned long Size() const;
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;