SmartConfigure and SmartUnPack have got smarter! The full descriptions of what they...

[apt.git] / apt-pkg / acquire-method.h

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 4e72d70942445a3ae433e5dca5f5a4d2dd26fc3a..72efa8065491e644370363a2fa7e97f1797c5f67 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -10,12 +10,20 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

+
+/** \addtogroup acquire
+ *  @{
+ *
+ *  \file acquire-method.h
+ */
+

 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 

+#include <stdarg.h>

 
 class Hashes;
 class pkgAcqMethod
 
 class Hashes;
 class pkgAcqMethod


@@ -30,12 +38,14 @@ class pkgAcqMethod
       string DestFile;
       time_t LastModified;
       bool IndexFile;
       string DestFile;
       time_t LastModified;
       bool IndexFile;

+      bool FailIgnore;

    };
    
    struct FetchResult
    {
       string MD5Sum;
       string SHA1Sum;
    };
    
    struct FetchResult
    {
       string MD5Sum;
       string SHA1Sum;

+      string SHA256Sum;

       vector<string> GPGVOutput;
       time_t LastModified;
       bool IMSHit;
       vector<string> GPGVOutput;
       time_t LastModified;
       bool IMSHit;


@@ -69,6 +79,8 @@ class pkgAcqMethod
    bool MediaFail(string Required,string Drive);
    virtual void Exit() {};
 
    bool MediaFail(string Required,string Drive);
    virtual void Exit() {};
 

+   void PrintStatus(char const * const header, const char* Format, va_list &args) const;
+

    public:
    enum CnfFlags {SingleInstance = (1<<0),
                   Pipeline = (1<<1), SendConfig = (1<<2),
    public:
    enum CnfFlags {SingleInstance = (1<<0),
                   Pipeline = (1<<1), SendConfig = (1<<2),


@@ -78,6 +90,8 @@ class pkgAcqMethod
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    

+   void Redirect(const string &NewURI);
+ 

    int Run(bool Single = false);
    inline void SetFailReason(string Msg) {FailReason = Msg;};
    inline void SetIP(string aIP) {IP = aIP;};
    int Run(bool Single = false);
    inline void SetFailReason(string Msg) {FailReason = Msg;};
    inline void SetIP(string aIP) {IP = aIP;};


@@ -86,4 +100,6 @@ class pkgAcqMethod
    virtual ~pkgAcqMethod() {};
 };
 
    virtual ~pkgAcqMethod() {};
 };
 

+/** @} */
+

 #endif
 #endif