po: update simplified chinese programs translation

[apt.git] / apt-pkg / cachefile.cc

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 567e0ea9ad12c61efd359ef1dad050ab2d67bef5..92a3b201bb8524f9f3e4f0252cd8ef70f7928387 100644 (file)
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -63,24 +63,29 @@ pkgCacheFile::~pkgCacheFile()
 }
                                                                        /*}}}*/
 // CacheFile::BuildCaches - Open and build the cache files             /*{{{*/
 }
                                                                        /*}}}*/
 // CacheFile::BuildCaches - Open and build the cache files             /*{{{*/

-// ---------------------------------------------------------------------
-/* */
+class APT_HIDDEN ScopedErrorMerge {
+public:
+   ScopedErrorMerge() { _error->PushToStack(); }
+   ~ScopedErrorMerge() { _error->MergeWithStack(); }
+};

 bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock)
 {
    if (Cache != NULL)
       return true;
 
 bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock)
 {
    if (Cache != NULL)
       return true;
 

+   ScopedErrorMerge sem;

    if (_config->FindB("pkgCacheFile::Generate", true) == false)
    {
       FileFd file(_config->FindFile("Dir::Cache::pkgcache"), FileFd::ReadOnly);
    if (_config->FindB("pkgCacheFile::Generate", true) == false)
    {
       FileFd file(_config->FindFile("Dir::Cache::pkgcache"), FileFd::ReadOnly);

+      if (file.IsOpen() == false || file.Failed())
+        return false;

       Map = new MMap(file, MMap::Public|MMap::ReadOnly);
       Map = new MMap(file, MMap::Public|MMap::ReadOnly);

+      if (unlikely(Map->validData() == false))
+        return false;

       Cache = new pkgCache(Map);
       Cache = new pkgCache(Map);

-      if (_error->PendingError() == true)
-         return false;
-      return true;
+      return _error->PendingError() == false;

    }
 
    }
 

-   const bool ErrorWasEmpty = _error->empty();

    if (WithLock == true)
       if (_system->Lock() == false)
         return false;
    if (WithLock == true)
       if (_system->Lock() == false)
         return false;


@@ -91,17 +96,19 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock)
    BuildSourceList(Progress);
 
    // Read the caches
    BuildSourceList(Progress);
 
    // Read the caches

-   bool Res = pkgCacheGenerator::MakeStatusCache(*SrcList,Progress,&Map, true);
+   Cache = nullptr;
+   bool Res = pkgCacheGenerator::MakeStatusCache(*SrcList,Progress,&Map, &Cache, true);

    if (Progress != NULL)
       Progress->Done();
    if (Res == false)
       return _error->Error(_("The package lists or status file could not be parsed or opened."));
 
    /* This sux, remove it someday */
    if (Progress != NULL)
       Progress->Done();
    if (Res == false)
       return _error->Error(_("The package lists or status file could not be parsed or opened."));
 
    /* This sux, remove it someday */

-   if (ErrorWasEmpty == true && _error->empty() == false)
+   if (_error->PendingError() == true)

       _error->Warning(_("You may want to run apt-get update to correct these problems"));
 
       _error->Warning(_("You may want to run apt-get update to correct these problems"));
 

-   Cache = new pkgCache(Map);
+   if (Cache == nullptr)
+      Cache = new pkgCache(Map);

    if (_error->PendingError() == true)
       return false;
    return true;
    if (_error->PendingError() == true)
       return false;
    return true;


@@ -188,9 +195,9 @@ void pkgCacheFile::RemoveCaches()
    std::string const srcpkgcache = _config->FindFile("Dir::cache::srcpkgcache");
 
    if (pkgcache.empty() == false && RealFileExists(pkgcache) == true)
    std::string const srcpkgcache = _config->FindFile("Dir::cache::srcpkgcache");
 
    if (pkgcache.empty() == false && RealFileExists(pkgcache) == true)

-      unlink(pkgcache.c_str());
+      RemoveFile("RemoveCaches", pkgcache);

    if (srcpkgcache.empty() == false && RealFileExists(srcpkgcache) == true)
    if (srcpkgcache.empty() == false && RealFileExists(srcpkgcache) == true)

-      unlink(srcpkgcache.c_str());
+      RemoveFile("RemoveCaches", srcpkgcache);

    if (pkgcache.empty() == false)
    {
       std::string cachedir = flNotFile(pkgcache);
    if (pkgcache.empty() == false)
    {
       std::string cachedir = flNotFile(pkgcache);


@@ -204,7 +211,7 @@ void pkgCacheFile::RemoveCaches()
            std::string nuke = flNotDir(*file);
            if (strncmp(cachefile.c_str(), nuke.c_str(), cachefile.length()) != 0)
               continue;
            std::string nuke = flNotDir(*file);
            if (strncmp(cachefile.c_str(), nuke.c_str(), cachefile.length()) != 0)
               continue;

-           unlink(file->c_str());
+           RemoveFile("RemoveCaches", *file);

         }
       }
    }
         }
       }
    }


@@ -223,7 +230,7 @@ void pkgCacheFile::RemoveCaches()
       std::string nuke = flNotDir(*file);
       if (strncmp(cachefile.c_str(), nuke.c_str(), cachefile.length()) != 0)
         continue;
       std::string nuke = flNotDir(*file);
       if (strncmp(cachefile.c_str(), nuke.c_str(), cachefile.length()) != 0)
         continue;

-      unlink(file->c_str());
+      RemoveFile("RemoveCaches", *file);

    }
 }
                                                                        /*}}}*/
    }
 }
                                                                        /*}}}*/