* merged from main

[apt.git] / apt-pkg / deb / dpkgpm.h

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index db6ce2a28879d2b8d3f884b390e00a3f5b9f792a..2ff8a9ac71ffb4d5cec6d8adb9282963283810d3 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: dpkgpm.h,v 1.3 1999/01/31 08:49:39 jgg Exp $
+// $Id: dpkgpm.h,v 1.8 2001/05/07 05:05:13 jgg Exp $

 /* ######################################################################
 
    DPKG Package Manager - Provide an interface to dpkg
 /* ######################################################################
 
    DPKG Package Manager - Provide an interface to dpkg


@@ -16,17 +16,27 @@
 
 #include <apt-pkg/packagemanager.h>
 #include <vector>
 
 #include <apt-pkg/packagemanager.h>
 #include <vector>

+#include <stdio.h>
+
+using std::vector;

 
 class pkgDPkgPM : public pkgPackageManager
 {
    protected:
 
 class pkgDPkgPM : public pkgPackageManager
 {
    protected:

+
+   // used for progress reporting
+   struct DpkgState 
+   {
+      const char *state;     // the dpkg state (e.g. "unpack")
+      const char *str;       // the human readable translation of the state
+   };

    
    struct Item
    {
    
    struct Item
    {

-      enum Ops {Install, Configure, Remove} Op;
+      enum Ops {Install, Configure, Remove, Purge} Op;

       string File;
       PkgIterator Pkg;
       string File;
       PkgIterator Pkg;

-      Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op), 
+      Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),

             File(File), Pkg(Pkg) {};
       Item() {};
       
             File(File), Pkg(Pkg) {};
       Item() {};
       


@@ -35,16 +45,19 @@ class pkgDPkgPM : public pkgPackageManager
 
    // Helpers
    bool RunScripts(const char *Cnf);
 
    // Helpers
    bool RunScripts(const char *Cnf);

+   bool RunScriptsWithPkgs(const char *Cnf);
+   bool SendV2Pkgs(FILE *F);

    
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);
    
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);

-   virtual bool Remove(PkgIterator Pkg);
-   virtual bool Go();
+   virtual bool Remove(PkgIterator Pkg,bool Purge = false);
+   virtual bool Go(int StatusFd=-1);
+   virtual void Reset();

    
    public:
 
    
    public:
 

-   pkgDPkgPM(pkgDepCache &Cache);
+   pkgDPkgPM(pkgDepCache *Cache);

    virtual ~pkgDPkgPM();
 };
 
    virtual ~pkgDPkgPM();
 };