merge from lp:~mvo/apt/mvo

[apt.git] / apt-pkg / deb / debmetaindex.h

diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 360fa5419a73a6ecf1075369c9f74f244dd8d232..695cfa7cc35d6880e64f30de1387ca46cb19538e 100644 (file)
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -19,12 +19,16 @@ class debReleaseIndex : public metaIndex {
    };
 
    private:
    };
 
    private:

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;

    std::map<string, vector<debSectionEntry const*> > ArchEntries;
    std::map<string, vector<debSectionEntry const*> > ArchEntries;

+   enum { ALWAYS_TRUSTED, NEVER_TRUSTED, CHECK_TRUST } Trusted;

 
    public:
 
    debReleaseIndex(string const &URI, string const &Dist);
 
    public:
 
    debReleaseIndex(string const &URI, string const &Dist);

-   ~debReleaseIndex();
+   debReleaseIndex(string const &URI, string const &Dist, bool const Trusted);
+   virtual ~debReleaseIndex();

 
    virtual string ArchiveURI(string const &File) const {return URI + File;};
    virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const;
 
    virtual string ArchiveURI(string const &File) const {return URI + File;};
    virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const;


@@ -37,8 +41,11 @@ class debReleaseIndex : public metaIndex {
    string IndexURISuffix(const char *Type, string const &Section, string const &Arch="native") const;
    string SourceIndexURI(const char *Type, const string &Section) const;
    string SourceIndexURISuffix(const char *Type, const string &Section) const;
    string IndexURISuffix(const char *Type, string const &Section, string const &Arch="native") const;
    string SourceIndexURI(const char *Type, const string &Section) const;
    string SourceIndexURISuffix(const char *Type, const string &Section) const;

+   string TranslationIndexURI(const char *Type, const string &Section) const;
+   string TranslationIndexURISuffix(const char *Type, const string &Section) const;

    virtual vector <pkgIndexFile *> *GetIndexFiles();
 
    virtual vector <pkgIndexFile *> *GetIndexFiles();
 

+   void SetTrusted(bool const Trusted);

    virtual bool IsTrusted() const;
 
    void PushSectionEntry(vector<string> const &Archs, const debSectionEntry *Entry);
    virtual bool IsTrusted() const;
 
    void PushSectionEntry(vector<string> const &Archs, const debSectionEntry *Entry);