* some WS fixes

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

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

-// $Id: packagemanager.h,v 1.4 1998/07/19 21:24:13 jgg Exp $
+// $Id: packagemanager.h,v 1.14 2001/05/07 04:24:08 jgg Exp $

 /* ######################################################################
 
    Package Manager - Abstacts the package manager
 /* ######################################################################
 
    Package Manager - Abstacts the package manager


@@ -20,7 +20,6 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 


@@ -29,30 +28,33 @@
 #endif
 
 #include <string>
 #endif
 
 #include <string>

+#include <iostream>

 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgcache.h>

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

 
 

-class pkgAquire;
+using std::string;
+
+class pkgAcquire;

 class pkgDepCache;
 class pkgSourceList;
 class pkgOrderList;
 class pkgDepCache;
 class pkgSourceList;
 class pkgOrderList;

-class pkgPackageManager
+class pkgRecords;
+class pkgPackageManager : protected pkgCache::Namespace

 {
 {

+   public:
+   
+   enum OrderResult {Completed,Failed,Incomplete};
+   

    protected:
    string *FileNames;
    pkgDepCache &Cache;
    pkgOrderList *List;
    protected:
    string *FileNames;
    pkgDepCache &Cache;
    pkgOrderList *List;

-   
-   // Bring some usefull types into the local scope
-   typedef pkgCache::PkgIterator PkgIterator;
-   typedef pkgCache::VerIterator VerIterator;
-   typedef pkgCache::DepIterator DepIterator;
-   typedef pkgCache::PrvIterator PrvIterator;
-   typedef pkgCache::Version Version;
-   typedef pkgCache::Package Package;
-      
+   bool Debug;
+         

    bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);
    bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);

-   bool OrderInstall();
+   virtual OrderResult OrderInstall();

    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);

+   bool CreateOrderList();

    
    // Analysis helpers
    bool DepAlwaysTrue(DepIterator D);
    
    // Analysis helpers
    bool DepAlwaysTrue(DepIterator D);


@@ -64,19 +66,53 @@ class pkgPackageManager
    bool SmartRemove(PkgIterator Pkg);
    bool EarlyRemove(PkgIterator Pkg);   
    
    bool SmartRemove(PkgIterator Pkg);
    bool EarlyRemove(PkgIterator Pkg);   
    

-   // The Actuall installation implementation
+   // The Actual installation implementation

    virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
    virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};

-   virtual bool Remove(PkgIterator /*Pkg*/) {return false;};
-   virtual bool Go() {return false;};
-   
-   public:
+   virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
+   virtual bool Go(int statusFd=-1) {return true;};
+   virtual void Reset() {};
+
+   // the result of the operation
+   OrderResult Res;

 
 

+   public:
+      

    // Main action members
    // Main action members

-   bool DoInstall();
+   bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
+                   pkgRecords *Recs);
+
+   // Do the installation 
+   OrderResult DoInstall() {
+      if(DoInstallPreFork() == Failed)
+        return Failed;
+
+      return DoInstallPostFork();
+   }
+
+   // stuff that needs to be done before the fork() of a library that
+   // uses apt
+   OrderResult DoInstallPreFork() {
+      Res = OrderInstall();
+      return Res;
+   };
+
+   // stuff that needs to be done after the fork
+   OrderResult DoInstallPostFork(int statusFd=-1) {
+      bool goResult = Go(statusFd);
+      if(goResult == false) 
+        return Failed;
+
+      // if all was fine update the state file
+      if(Res == Completed) {
+        Cache.writeStateFile(NULL);
+      }
+      return Res;
+   };
+

    bool FixMissing();
    
    bool FixMissing();
    

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

    virtual ~pkgPackageManager();
 };
 
    virtual ~pkgPackageManager();
 };