merged from lp:~donkult/apt/sid

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

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 99a4605b146ae3b03b7db8bc4e9e242de4b6deda..72efa8065491e644370363a2fa7e97f1797c5f67 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -23,6 +23,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 

+#include <stdarg.h>

 
 class Hashes;
 class pkgAcqMethod
 
 class Hashes;
 class pkgAcqMethod


@@ -37,6 +38,7 @@ class pkgAcqMethod
       string DestFile;
       time_t LastModified;
       bool IndexFile;
       string DestFile;
       time_t LastModified;
       bool IndexFile;

+      bool FailIgnore;

    };
    
    struct FetchResult
    };
    
    struct FetchResult


@@ -77,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),