move pkgSourceList::AddMetaIndex() into a private subclass until we decide about...

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index cdf8d9762b03f18a3ea1c421a428e0309a2cb61a..99e83f45469efd718ee137e4789674db8508c71a 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -52,7 +52,15 @@ class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;
 
 class pkgIndexFile;
 class metaIndex;
 

-class pkgSourceList
+class pkgSource
+{
+   protected:
+
+   std::vector<metaIndex *> SrcList;
+
+};
+
+class pkgSourceList : public pkgSource

 {
    public:
    
 {
    public:
    


@@ -116,11 +124,6 @@ class pkgSourceList
    // query last-modified time
    time_t GetLastModifiedTime();
 
    // query last-modified time
    time_t GetLastModifiedTime();
 

-   // Add custom metaIndex (e.g. local files)
-   void AddMetaIndex(metaIndex *mi) {
-      SrcList.push_back(mi);
-   }
-

    pkgSourceList();
    pkgSourceList(std::string File);
    ~pkgSourceList();      
    pkgSourceList();
    pkgSourceList(std::string File);
    ~pkgSourceList();      

diff --git a/apt-private/private-cachefile.h b/apt-private/private-cachefile.h
index dce7e0a3a80bd18b9c90c26f1d2c5459aea79fe2..1fddabfbd5428de9c0e10fd7c1458b9b29b2f2eb 100644 (file)
--- a/apt-private/private-cachefile.h
+++ b/apt-private/private-cachefile.h
@@ -6,7 +6,20 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/macros.h>

+#include <apt-pkg/sourcelist.h>
+#include <apti18n.h>

 
 

+// FIXME: we need to find a way to export this 
+class APT_PUBLIC SourceList : public pkgSourceList
+{
+   
+ public:
+   // Add custom metaIndex (e.g. local files)
+   void AddMetaIndex(metaIndex *mi) {
+      SrcList.push_back(mi);
+   }
+
+};

 
 // class CacheFile - Cover class for some dependency cache functions   /*{{{*/
 // ---------------------------------------------------------------------
 
 // class CacheFile - Cover class for some dependency cache functions   /*{{{*/
 // ---------------------------------------------------------------------


@@ -28,6 +41,16 @@ class APT_PUBLIC CacheFile : public pkgCacheFile
         return false;
       return true;
    }
         return false;
       return true;
    }

+   // FIXME: this can go once the "libapt-pkg" pkgSourceList has a way
+   //        to add custom metaIndexes (or custom local files or so)
+   bool BuildSourceList(OpProgress */*Progress*/ = NULL) {
+      if (SrcList != NULL)
+         return true;
+      SrcList = new SourceList();
+      if (SrcList->ReadMainList() == false)
+         return _error->Error(_("The list of sources could not be read."));
+      return true;
+   }

    bool Open(bool WithLock = true) 
    {
       OpTextProgress Prog(*_config);
    bool Open(bool WithLock = true) 
    {
       OpTextProgress Prog(*_config);

diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index e7606a1d1be22c68587e71cdf1444be63d901b84..35649fcdbc3492aa98faeb108c772e26428b1f78 100644 (file)
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -685,7 +685,9 @@ bool DoInstall(CommandLine &CmdL)
             std::map<std::string, std::string> Options;
             if(Type->CreateItem(List, *I, "", "", Options))
             {
             std::map<std::string, std::string> Options;
             if(Type->CreateItem(List, *I, "", "", Options))
             {

-               pkgSourceList *sources = Cache.GetSourceList();
+               // we have our own CacheFile that gives us a SourceList
+               // with superpowerz
+               SourceList *sources = (SourceList*)Cache.GetSourceList();

                sources->AddMetaIndex(List[0]);
             }
          }
                sources->AddMetaIndex(List[0]);
             }
          }