rred: If there were I/O errors, fail

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

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index aaa2436c5d787fcf4bcad623b1f93afc37efb963..6db0749d4d217cb5f550035a1f48479799c7da41 100644 (file)
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -26,6 +26,7 @@
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/indexfile.h>
 
 #include <string.h>
 #include <unistd.h>
@@ -80,6 +81,8 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock)
       if (file.IsOpen() == false || file.Failed())
         return false;
       Map = new MMap(file, MMap::Public|MMap::ReadOnly);
+      if (unlikely(Map->validData() == false))
+        return false;
       Cache = new pkgCache(Map);
       return _error->PendingError() == false;
    }
@@ -94,7 +97,8 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock)
    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)
@@ -104,7 +108,8 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock)
    if (_error->PendingError() == true)
       _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;
@@ -182,6 +187,60 @@ bool pkgCacheFile::Open(OpProgress *Progress, bool WithLock)
    return true;
 }
                                                                        /*}}}*/
+bool pkgCacheFile::AddIndexFile(pkgIndexFile * const File)             /*{{{*/
+{
+   if (SrcList == NULL)
+      if (BuildSourceList() == false)
+        return false;
+   SrcList->AddVolatileFile(File);
+
+   if (Cache == nullptr || File->HasPackages() == false || File->Exists() == false)
+      return true;
+
+   if (File->FindInCache(*Cache).end() == false)
+      return _error->Warning("Duplicate sources.list entry %s",
+           File->Describe().c_str());
+
+   if (ExternOwner == false)
+   {
+      delete DCache;
+      delete Cache;
+   }
+   delete Policy;
+   DCache = NULL;
+   Policy = NULL;
+   Cache = NULL;
+
+   if (ExternOwner == false)
+   {
+      // a dynamic mmap means that we have build at least parts of the cache
+      // in memory – which we might or might not have written to disk.
+      // Throwing away would therefore be a very costly operation we want to avoid
+      DynamicMMap * dynmmap = dynamic_cast<DynamicMMap*>(Map);
+      if (dynmmap != nullptr)
+      {
+        {
+           pkgCacheGenerator Gen(dynmmap, nullptr);
+           if (Gen.Start() == false || File->Merge(Gen, nullptr) == false)
+              return false;
+        }
+        Cache = new pkgCache(Map);
+        return _error->PendingError() == false;
+      }
+      else
+      {
+        delete Map;
+        Map = NULL;
+      }
+   }
+   else
+   {
+      ExternOwner = false;
+      Map = NULL;
+   }
+   return true;
+}
+                                                                       /*}}}*/
 // CacheFile::RemoveCaches - remove all cache files from disk          /*{{{*/
 // ---------------------------------------------------------------------
 /* */