* wording fixes (cherry picked from apt--mvo)

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

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index e3d18e3412597bdfa286c31a7bb01881fc80c76a..f46209d12823aabccbdef8bf7278402a52e207bf 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.h,v 1.2 1998/11/01 05:27:32 jgg Exp $
+// $Id: acquire-method.h,v 1.15.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Acquire Method - Method helper class + functions
 /* ######################################################################
 
    Acquire Method - Method helper class + functions


@@ -14,12 +14,13 @@
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #include <apt-pkg/configuration.h>
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #include <apt-pkg/configuration.h>

-#include <strutl.h>
+#include <apt-pkg/strutl.h>

 
 #ifdef __GNUG__
 #pragma interface "apt-pkg/acquire-method.h"
 #endif 
 
 
 #ifdef __GNUG__
 #pragma interface "apt-pkg/acquire-method.h"
 #endif 
 

+class Hashes;

 class pkgAcqMethod
 {
    protected:
 class pkgAcqMethod
 {
    protected:


@@ -31,43 +32,55 @@ class pkgAcqMethod
       string Uri;
       string DestFile;
       time_t LastModified;
       string Uri;
       string DestFile;
       time_t LastModified;

+      bool IndexFile;

    };
    
    };
    

-   

    struct FetchResult
    {
       string MD5Sum;
    struct FetchResult
    {
       string MD5Sum;

+      string SHA1Sum;
+      vector<string> GPGVOutput;

       time_t LastModified;
       bool IMSHit;
       string Filename;
       unsigned long Size;
       time_t LastModified;
       bool IMSHit;
       string Filename;
       unsigned long Size;

-      unsigned long ResumePoint;      
+      unsigned long ResumePoint;
+      
+      void TakeHashes(Hashes &Hash);

       FetchResult();
    };
 
    // State
    vector<string> Messages;
    FetchItem *Queue;
       FetchResult();
    };
 
    // State
    vector<string> Messages;
    FetchItem *Queue;

-      
+   FetchItem *QueueBack;
+   string FailExtra;
+   

    // Handlers for messages
    virtual bool Configuration(string Message);
    // Handlers for messages
    virtual bool Configuration(string Message);

-   virtual bool Fetch(FetchItem *Item) {return true;};
+   virtual bool Fetch(FetchItem * /*Item*/) {return true;};

    
    // Outgoing messages
    
    // Outgoing messages

-   void Fail();
-   void Fail(string Why);
+   void Fail(bool Transient = false);
+   inline void Fail(const char *Why, bool Transient = false) {Fail(string(Why),Transient);};
+   void Fail(string Why, bool Transient = false);

    void URIStart(FetchResult &Res);
    void URIDone(FetchResult &Res,FetchResult *Alt = 0);
    void URIStart(FetchResult &Res);
    void URIDone(FetchResult &Res,FetchResult *Alt = 0);

-                
+   bool MediaFail(string Required,string Drive);
+   virtual void Exit() {};
+

    public:
    public:

-   
-   enum CnfFlags {SingleInstance = (1<<0), PreScan = (1<<1), 
-                  Pipeline = (1<<2), SendConfig = (1<<3)};
+
+   enum CnfFlags {SingleInstance = (1<<0),
+                  Pipeline = (1<<1), SendConfig = (1<<2),
+                  LocalOnly = (1<<3), NeedsCleanup = (1<<4), 
+                  Removable = (1<<5)};

 
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    
    int Run(bool Single = false);
 
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    
    int Run(bool Single = false);

+   inline void SetFailExtraMsg(string Msg) {FailExtra = Msg;};

    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    virtual ~pkgAcqMethod() {};
    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    virtual ~pkgAcqMethod() {};