* merged from main

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

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index b4dee3c2240fa2707ea24af9fba777f159772afa..a1b9583a44bb19070da01ef9cd3ed7a3475c2262 100644 (file)
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debindexfile.h,v 1.2 2001/02/20 07:03:17 jgg Exp $
+// $Id: debindexfile.h,v 1.3.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Debian Index Files
 /* ######################################################################
 
    Debian Index Files


@@ -31,7 +31,7 @@ class debStatusIndex : public pkgIndexFile
    virtual const Type *GetType() const;
    
    // Interface for acquire
    virtual const Type *GetType() const;
    
    // Interface for acquire

-   virtual string Describe() const {return File;};
+   virtual string Describe(bool Short) const {return File;};

    
    // Interface for the Cache Generator
    virtual bool Exists() const;
    
    // Interface for the Cache Generator
    virtual bool Exists() const;


@@ -48,10 +48,10 @@ class debPackagesIndex : public pkgIndexFile
    string URI;
    string Dist;
    string Section;
    string URI;
    string Dist;
    string Section;

-   
+

    string Info(const char *Type) const;
    string IndexFile(const char *Type) const;
    string Info(const char *Type) const;
    string IndexFile(const char *Type) const;

-   string IndexURI(const char *Type) const;   
+   string IndexURI(const char *Type) const;

    
    public:
    
    
    public:
    


@@ -62,8 +62,7 @@ class debPackagesIndex : public pkgIndexFile
    virtual string ArchiveURI(string File) const {return URI + File;};
    
    // Interface for acquire
    virtual string ArchiveURI(string File) const {return URI + File;};
    
    // Interface for acquire

-   virtual string Describe() const;   
-   virtual bool GetIndexes(pkgAcquire *Owner) const;
+   virtual string Describe(bool Short) const;   

    
    // Interface for the Cache Generator
    virtual bool Exists() const;
    
    // Interface for the Cache Generator
    virtual bool Exists() const;


@@ -71,8 +70,8 @@ class debPackagesIndex : public pkgIndexFile
    virtual unsigned long Size() const;
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
    virtual unsigned long Size() const;
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;

-   
-   debPackagesIndex(string URI,string Dist,string Section);
+
+   debPackagesIndex(string URI,string Dist,string Section,bool Trusted);

 };
 
 class debSourcesIndex : public pkgIndexFile
 };
 
 class debSourcesIndex : public pkgIndexFile


@@ -83,7 +82,7 @@ class debSourcesIndex : public pkgIndexFile
 
    string Info(const char *Type) const;
    string IndexFile(const char *Type) const;
 
    string Info(const char *Type) const;
    string IndexFile(const char *Type) const;

-   string IndexURI(const char *Type) const;   
+   string IndexURI(const char *Type) const;

    
    public:
 
    
    public:
 


@@ -95,8 +94,7 @@ class debSourcesIndex : public pkgIndexFile
    virtual string ArchiveURI(string File) const {return URI + File;};
    
    // Interface for acquire
    virtual string ArchiveURI(string File) const {return URI + File;};
    
    // Interface for acquire

-   virtual string Describe() const;   
-   virtual bool GetIndexes(pkgAcquire *Owner) const;
+   virtual string Describe(bool Short) const;   

 
    // Interface for the record parsers
    virtual pkgSrcRecords::Parser *CreateSrcParser() const;
 
    // Interface for the record parsers
    virtual pkgSrcRecords::Parser *CreateSrcParser() const;


@@ -106,7 +104,7 @@ class debSourcesIndex : public pkgIndexFile
    virtual bool HasPackages() const {return false;};
    virtual unsigned long Size() const;
    
    virtual bool HasPackages() const {return false;};
    virtual unsigned long Size() const;
    

-   debSourcesIndex(string URI,string Dist,string Section);
+   debSourcesIndex(string URI,string Dist,string Section,bool Trusted);

 };
 
 #endif
 };
 
 #endif