Ensure we have a Policy in CacheFile.BuildDepCache()

[apt.git] / apt-pkg / sourcelist.h

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index af3f4f5c6add823f0a099de550e2db9bdaafc5ed..9df0c1d7419c3fbd46e38fef1d113fbd8e06b067 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -27,17 +27,27 @@
 #ifndef PKGLIB_SOURCELIST_H
 #define PKGLIB_SOURCELIST_H
 
 #ifndef PKGLIB_SOURCELIST_H
 #define PKGLIB_SOURCELIST_H
 

+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
+
+#include <time.h>
+

 #include <string>
 #include <vector>
 #include <map>
 #include <string>
 #include <vector>
 #include <map>

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

 
 

+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/tagfile.h>
+#endif

 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/metaindex.h>
 using std::string;
 using std::vector;
 #endif
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/metaindex.h>
 using std::string;
 using std::vector;
 #endif
 

+class FileFd;
+class pkgTagSection;

 class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;
 class pkgAcquire;
 class pkgIndexFile;
 class metaIndex;


@@ -54,12 +64,16 @@ class pkgSourceList
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;

-      static Type *GetType(const char *Type);
+      static Type *GetType(const char *Type) APT_PURE;

 
       const char *Name;
       const char *Label;
 
       bool FixupURI(std::string &URI) const;
 
       const char *Name;
       const char *Label;
 
       bool FixupURI(std::string &URI) const;

+      virtual bool ParseStanza(std::vector<metaIndex *> &List,
+                               pkgTagSection &Tags,
+                               int stanza_n,
+                               FileFd &Fd);

       virtual bool ParseLine(std::vector<metaIndex *> &List,
                             const char *Buffer,
                             unsigned long const &CurLine,std::string const &File) const;
       virtual bool ParseLine(std::vector<metaIndex *> &List,
                             const char *Buffer,
                             unsigned long const &CurLine,std::string const &File) const;


@@ -76,8 +90,8 @@ class pkgSourceList
 
    std::vector<metaIndex *> SrcList;
 
 
    std::vector<metaIndex *> SrcList;
 

-   // FIXME: move int Type with the next ABI break
-   bool ParseFileDeb822(FileFd &Fd);
+   int ParseFileDeb822(std::string File);
+   bool ParseFileOldStyle(std::string File);

 
    public:
 
 
    public: