support setting empty values (sanely) & removing support for

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

diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 22eac2f60c1f44289c7ee0b7990fefb5f4eb7070..aaa2436c5d787fcf4bcad623b1f93afc37efb963 100644 (file)
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -12,6 +12,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>


@@ -19,16 +21,27 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/pkgsystem.h>

-#include <apt-pkg/acquire-item.h>

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/fileutl.h>

-    
+#include <apt-pkg/progress.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+
+#include <string.h>
+#include <unistd.h>
+#include <string>
+#include <vector>
+

 #include <apti18n.h>
                                                                        /*}}}*/
 #include <apti18n.h>
                                                                        /*}}}*/

-

 // CacheFile::CacheFile - Constructor                                  /*{{{*/
 // CacheFile::CacheFile - Constructor                                  /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-pkgCacheFile::pkgCacheFile() : Map(0), Cache(0), DCache(0), Policy(0)
+pkgCacheFile::pkgCacheFile() : d(NULL), ExternOwner(false), Map(NULL), Cache(NULL),
+                               DCache(NULL), SrcList(NULL), Policy(NULL)
+{
+}
+pkgCacheFile::pkgCacheFile(pkgDepCache * const Owner) : d(NULL), ExternOwner(true),
+   Map(&Owner->GetCache().GetMap()), Cache(&Owner->GetCache()),
+   DCache(Owner), SrcList(NULL), Policy(NULL)

 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/


@@ -37,41 +50,58 @@ pkgCacheFile::pkgCacheFile() : Map(0), Cache(0), DCache(0), Policy(0)
 /* */
 pkgCacheFile::~pkgCacheFile()
 {
 /* */
 pkgCacheFile::~pkgCacheFile()
 {

-   delete DCache;
+   if (ExternOwner == false)
+   {
+      delete DCache;
+      delete Cache;
+      delete Map;
+   }

    delete Policy;
    delete Policy;

-   delete Cache;
-   delete Map;
-   _system->UnLock(true);
-}   
+   delete SrcList;
+   if (ExternOwner == false)
+      _system->UnLock(true);
+}

                                                                        /*}}}*/
 // CacheFile::BuildCaches - Open and build the cache files             /*{{{*/
                                                                        /*}}}*/
 // CacheFile::BuildCaches - Open and build the cache files             /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock)
+class APT_HIDDEN ScopedErrorMerge {
+public:
+   ScopedErrorMerge() { _error->PushToStack(); }
+   ~ScopedErrorMerge() { _error->MergeWithStack(); }
+};
+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 (file.IsOpen() == false || file.Failed())
+        return false;
+      Map = new MMap(file, MMap::Public|MMap::ReadOnly);
+      Cache = new pkgCache(Map);
+      return _error->PendingError() == false;
+   }
+

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

-   
-   if (_config->FindB("Debug::NoLocking",false) == true)
-      WithLock = false;
-      
+

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

-   
-   // Read the source list
-   pkgSourceList List;
-   if (List.ReadMainList() == false)
-      return _error->Error(_("The list of sources could not be read."));
+
+   BuildSourceList(Progress);

 
    // Read the caches
 
    // Read the caches

-   bool Res = pkgMakeStatusCache(List,Progress,&Map,!WithLock);
-   Progress.Done();
+   bool Res = pkgCacheGenerator::MakeStatusCache(*SrcList,Progress,&Map, 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 (Res == false)
       return _error->Error(_("The package lists or status file could not be parsed or opened."));
 
    /* This sux, remove it someday */

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

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


@@ -80,124 +110,147 @@ bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// CacheFile::Open - Open the cache files, creating if necessary       /*{{{*/
+// CacheFile::BuildSourceList - Open and build all relevant sources.list/*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock)
+bool pkgCacheFile::BuildSourceList(OpProgress * /*Progress*/)

 {
 {

-   if (BuildCaches(Progress,WithLock) == false)
-      return false;
-   
-   // The policy engine
+   if (SrcList != NULL)
+      return true;
+
+   SrcList = new pkgSourceList();
+   if (SrcList->ReadMainList() == false)
+      return _error->Error(_("The list of sources could not be read."));
+   return true;
+}
+                                                                       /*}}}*/
+// CacheFile::BuildPolicy - Open and build all relevant preferences    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgCacheFile::BuildPolicy(OpProgress * /*Progress*/)
+{
+   if (Policy != NULL)
+      return true;
+

    Policy = new pkgPolicy(Cache);
    if (_error->PendingError() == true)
       return false;
    Policy = new pkgPolicy(Cache);
    if (_error->PendingError() == true)
       return false;

-   if (ReadPinFile(*Policy) == false)
-      return false;
-   
-   // Create the dependency cache
-   DCache = new pkgDepCache(Cache,Policy);
-   if (_error->PendingError() == true)
-      return false;
-   
-   DCache->Init(&Progress);
-   Progress.Done();
-   if (_error->PendingError() == true)
+
+   if (ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false)

       return false;
       return false;

-   
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-
-// CacheFile::ListUpdate - update the cache files                      /*{{{*/
+// CacheFile::BuildDepCache - Open and build the dependency cache      /*{{{*/

 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------

-/* This is a simple wrapper to update the cache. it will fetch stuff
- * from the network (or any other sources defined in sources.list)
- */
-bool pkgCacheFile::ListUpdate(pkgAcquireStatus &Stat, 
-                             pkgSourceList &List, 
-                             int PulseInterval)
+/* */
+bool pkgCacheFile::BuildDepCache(OpProgress *Progress)

 {
 {

-   pkgAcquire::RunResult res;
-   pkgAcquire Fetcher(&Stat);
+   if (DCache != NULL)
+      return true;

 
 

-   // Populate it with the source selection
-   if (List.GetIndexes(&Fetcher) == false)
-        return false;
+   if (BuildPolicy(Progress) == false)
+      return false;

 
 

-   // Run scripts
-   RunScripts("APT::Update::Pre-Invoke");
-   
-   // check arguments
-   if(PulseInterval>0)
-      res = Fetcher.Run(PulseInterval);
-   else
-      res = Fetcher.Run();
+   DCache = new pkgDepCache(Cache,Policy);
+   if (_error->PendingError() == true)
+      return false;

 
 

-   if (res == pkgAcquire::Failed)
+   return DCache->Init(Progress);
+}
+                                                                       /*}}}*/
+// CacheFile::Open - Open the cache files, creating if necessary       /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgCacheFile::Open(OpProgress *Progress, bool WithLock)
+{
+   if (BuildCaches(Progress,WithLock) == false)

       return false;
 
       return false;
 

-   bool Failed = false;
-   bool TransientNetworkFailure = false;
-   for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); 
-       I != Fetcher.ItemsEnd(); I++)
-   {
-      if ((*I)->Status == pkgAcquire::Item::StatDone)
-        continue;
+   if (BuildPolicy(Progress) == false)
+      return false;

 
 

-      (*I)->Finished();
+   if (BuildDepCache(Progress) == false)
+      return false;

 
 

-      fprintf(stderr,_("Failed to fetch %s  %s\n"),(*I)->DescURI().c_str(),
-             (*I)->ErrorText.c_str());
+   if (Progress != NULL)
+      Progress->Done();
+   if (_error->PendingError() == true)
+      return false;
+   
+   return true;
+}
+                                                                       /*}}}*/
+// CacheFile::RemoveCaches - remove all cache files from disk          /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgCacheFile::RemoveCaches()
+{
+   std::string const pkgcache = _config->FindFile("Dir::cache::pkgcache");
+   std::string const srcpkgcache = _config->FindFile("Dir::cache::srcpkgcache");

 
 

-      if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError) 
+   if (pkgcache.empty() == false && RealFileExists(pkgcache) == true)
+      RemoveFile("RemoveCaches", pkgcache);
+   if (srcpkgcache.empty() == false && RealFileExists(srcpkgcache) == true)
+      RemoveFile("RemoveCaches", srcpkgcache);
+   if (pkgcache.empty() == false)
+   {
+      std::string cachedir = flNotFile(pkgcache);
+      std::string cachefile = flNotDir(pkgcache);
+      if (cachedir.empty() != true && cachefile.empty() != true && DirectoryExists(cachedir) == true)

       {
       {

-        TransientNetworkFailure = true;
-        continue;
+        cachefile.append(".");
+        std::vector<std::string> caches = GetListOfFilesInDir(cachedir, false);
+        for (std::vector<std::string>::const_iterator file = caches.begin(); file != caches.end(); ++file)
+        {
+           std::string nuke = flNotDir(*file);
+           if (strncmp(cachefile.c_str(), nuke.c_str(), cachefile.length()) != 0)
+              continue;
+           RemoveFile("RemoveCaches", *file);
+        }

       }
       }

-
-      Failed = true;

    }
    }

-   
-   // Clean out any old list files
-   // Keep "APT::Get::List-Cleanup" name for compatibility, but
-   // this is really a global option for the APT library now
-   if (!TransientNetworkFailure && !Failed &&
-       (_config->FindB("APT::Get::List-Cleanup",true) == true ||
-       _config->FindB("APT::List-Cleanup",true) == true))
-   {
-      if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false ||
-         Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false)
-        // something went wrong with the clean
-        return false;
-   }
-   
-   if (TransientNetworkFailure == true)
-      _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead."));
-   else if (Failed == true)
-      return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead."));

 
 

+   if (srcpkgcache.empty() == true)
+      return;

 
 

-   // Run the scripts if all was fine
-   RunScripts("APT::Update::Post-Invoke");
-   return true;
+   std::string cachedir = flNotFile(srcpkgcache);
+   std::string cachefile = flNotDir(srcpkgcache);
+   if (cachedir.empty() == true || cachefile.empty() == true || DirectoryExists(cachedir) == false)
+      return;
+   cachefile.append(".");
+   std::vector<std::string> caches = GetListOfFilesInDir(cachedir, false);
+   for (std::vector<std::string>::const_iterator file = caches.begin(); file != caches.end(); ++file)
+   {
+      std::string nuke = flNotDir(*file);
+      if (strncmp(cachefile.c_str(), nuke.c_str(), cachefile.length()) != 0)
+        continue;
+      RemoveFile("RemoveCaches", *file);
+   }

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

-

 // CacheFile::Close - close the cache files                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 void pkgCacheFile::Close()
 {
 // CacheFile::Close - close the cache files                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 void pkgCacheFile::Close()
 {

-   delete DCache;
+   if (ExternOwner == false)
+   {
+      delete DCache;
+      delete Cache;
+      delete Map;
+   }
+   else
+      ExternOwner = false;

    delete Policy;
    delete Policy;

-   delete Cache;
-   delete Map;
+   delete SrcList;

    _system->UnLock(true);
 
    _system->UnLock(true);
 

-   Map = 0;
-   DCache = 0;
-   Policy = 0;
-   Cache = 0;
+   Map = NULL;
+   DCache = NULL;
+   Policy = NULL;
+   Cache = NULL;
+   SrcList = NULL;

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