Random fixes..

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

diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index 0dc8a5038b2df7adf0acc5f821c8568daf447db1..f15db4ce67a3f352c867bfdad6c739de601d08f7 100644 (file)
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: orderlist.h,v 1.1 1998/07/07 04:17:01 jgg Exp $
+// $Id: orderlist.h,v 1.6 1999/08/03 05:19:41 jgg Exp $
 /* ######################################################################
 
    Order List - Represents and Manipulates an ordered list of packages.
@@ -18,10 +18,10 @@
 #define PKGLIB_ORDERLIST_H
 
 #ifdef __GNUG__
-#pragma interface "pkglib/orderlist.h"
+#pragma interface "apt-pkg/orderlist.h"
 #endif 
 
-#include <pkglib/pkgcache.h>
+#include <apt-pkg/pkgcache.h>
 
 class pkgDepCache;
 class pkgOrderList
@@ -48,6 +48,7 @@ class pkgOrderList
    // State
    Package **End;
    Package **List;
+   string *FileList;
    DepIterator Loops[20];
    int LoopCount;
    int Depth;
@@ -58,7 +59,7 @@ class pkgOrderList
    bool VisitDeps(DepFunc F,PkgIterator Pkg);
    bool VisitRDeps(DepFunc F,PkgIterator Pkg);
    bool VisitRProvides(DepFunc F,VerIterator Ver);
-   bool VisitProvides(DepIterator Pkg);
+   bool VisitProvides(DepIterator Pkg,bool Critical);
    
    // Dependency checking functions.
    bool DepUnPackCrit(DepIterator D);
@@ -98,8 +99,10 @@ class pkgOrderList
    inline void Flag(PkgIterator Pkg,unsigned long F) {Flags[Pkg->ID] |= F;};
    inline void Flag(Package *Pkg,unsigned long F) {Flags[Pkg->ID] |= F;};
    inline bool IsNow(PkgIterator Pkg) {return (Flags[Pkg->ID] & States) == 0;};
+   bool IsMissing(PkgIterator Pkg);
    void WipeFlags(unsigned long F);
-   
+   void SetFileList(string *FileList) {this->FileList = FileList;};
+
    // Accessors
    inline iterator begin() {return List;};
    inline iterator end() {return End;};
@@ -111,7 +114,7 @@ class pkgOrderList
    
    // Ordering modes
    bool OrderCritical();
-   bool OrderUnpack();
+   bool OrderUnpack(string *FileList = 0);
    bool OrderConfigure();
 
    int Score(PkgIterator Pkg);