CDROMs are unmounted

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

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

-// $Id: acquire.h,v 1.21 1999/06/13 05:06:40 jgg Exp $
+// $Id: acquire.h,v 1.25 1999/10/18 00:37:35 jgg Exp $

 /* ######################################################################
 
    Acquire - File Acquiration
 /* ######################################################################
 
    Acquire - File Acquiration


@@ -82,8 +82,8 @@ class pkgAcquire
    string QueueName(string URI,MethodConfig const *&Config);
 
    // FDSET managers for derived classes
    string QueueName(string URI,MethodConfig const *&Config);
 
    // FDSET managers for derived classes

-   void SetFds(int &Fd,fd_set *RSet,fd_set *WSet);
-   void RunFds(fd_set *RSet,fd_set *WSet);   
+   virtual void SetFds(int &Fd,fd_set *RSet,fd_set *WSet);
+   virtual void RunFds(fd_set *RSet,fd_set *WSet);   

 
    // A queue calls this when it dequeues an item
    void Bump();
 
    // A queue calls this when it dequeues an item
    void Bump();


@@ -95,7 +95,8 @@ class pkgAcquire
    enum RunResult {Continue,Failed,Cancelled};
 
    RunResult Run();
    enum RunResult {Continue,Failed,Cancelled};
 
    RunResult Run();

-
+   void Shutdown();
+   

    // Simple iteration mechanism
    inline Worker *WorkersBegin() {return Workers;};
    Worker *WorkerStep(Worker *I);
    // Simple iteration mechanism
    inline Worker *WorkersBegin() {return Workers;};
    Worker *WorkerStep(Worker *I);


@@ -116,7 +117,7 @@ class pkgAcquire
    unsigned long PartialPresent();
    
    pkgAcquire(pkgAcquireStatus *Log = 0);
    unsigned long PartialPresent();
    
    pkgAcquire(pkgAcquireStatus *Log = 0);

-   ~pkgAcquire();
+   virtual ~pkgAcquire();

 };
 
 // Description of an Item+URI
 };
 
 // Description of an Item+URI


@@ -174,7 +175,7 @@ class pkgAcquire::Queue
    bool ItemDone(QItem *Itm);
    
    bool Startup();
    bool ItemDone(QItem *Itm);
    
    bool Startup();

-   bool Shutdown();
+   bool Shutdown(bool Final);

    bool Cycle();
    void Bump();
    
    bool Cycle();
    void Bump();
    


@@ -228,7 +229,8 @@ struct pkgAcquire::MethodConfig
    bool Pipeline;
    bool SendConfig;
    bool LocalOnly;
    bool Pipeline;
    bool SendConfig;
    bool LocalOnly;

-      
+   bool NeedsCleanup;
+   

    MethodConfig();
 };
 
    MethodConfig();
 };
 


@@ -258,10 +260,10 @@ class pkgAcquireStatus
    virtual bool MediaChange(string Media,string Drive) = 0;
    
    // Each of these is called by the workers when an event occures
    virtual bool MediaChange(string Media,string Drive) = 0;
    
    // Each of these is called by the workers when an event occures

-   virtual void IMSHit(pkgAcquire::ItemDesc &Itm) {};
-   virtual void Fetch(pkgAcquire::ItemDesc &Itm) {};
-   virtual void Done(pkgAcquire::ItemDesc &Itm) {};
-   virtual void Fail(pkgAcquire::ItemDesc &Itm) {};
+   virtual void IMSHit(pkgAcquire::ItemDesc &/*Itm*/) {};
+   virtual void Fetch(pkgAcquire::ItemDesc &/*Itm*/) {};
+   virtual void Done(pkgAcquire::ItemDesc &/*Itm*/) {};
+   virtual void Fail(pkgAcquire::ItemDesc &/*Itm*/) {};

    virtual bool Pulse(pkgAcquire *Owner); // returns false on user cancel
    virtual void Start();
    virtual void Stop();
    virtual bool Pulse(pkgAcquire *Owner); // returns false on user cancel
    virtual void Start();
    virtual void Stop();