Reorderd error handling

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

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 014cfb7f15efc98d6cd4d7967d1119ebdf80b630..ca03dd1d1a559738d0ebceafc87e678a473fccb3 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acquire-method.h,v 1.8 1998/12/22 07:58:49 jgg Exp $
+// $Id: acquire-method.h,v 1.12 1999/10/18 00:37:35 jgg Exp $
 /* ######################################################################
 
    Acquire Method - Method helper class + functions
@@ -14,7 +14,7 @@
 #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"
@@ -52,21 +52,22 @@ class pkgAcqMethod
       
    // Handlers for messages
    virtual bool Configuration(string Message);
-   virtual bool Fetch(FetchItem *Item) {return true;};
+   virtual bool Fetch(FetchItem * /*Item*/) {return true;};
    
    // Outgoing messages
    void Fail(bool Transient = false);
-   inline void Fail(const char *Why, bool Transient = false) {Fail(Why,Transient);};
+   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);
    bool MediaFail(string Required,string Drive);
-   
+   void Exit() {};
+
    public:
 
    enum CnfFlags {SingleInstance = (1<<0),
                   Pipeline = (1<<1), SendConfig = (1<<2),
-                  LocalOnly = (1<<3)};
+                  LocalOnly = (1<<3), NeedsCleanup = (1<<4)};
 
    void Log(const char *Format,...);
    void Status(const char *Format,...);