Split ListParser::NewDepends into two methods to use these new method

for creating the dependencies needed for our groups:
For now for all groups only one package can be installed at the same
time which conflicts with each other packages in the group.
The exceptions are architecture all package.

Also, the Multi-Arch field is now parsed, but not used for now.

1 files changed, 10 insertions, 2 deletions

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index b3d2752d2..5f50001d0 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -125,9 +125,12 @@ class pkgCache								/*{{{*/
    
    // Accessors
    GrpIterator FindGrp(const string &Name);
-   PkgIterator FindPkg(const string &Name, string Arch = "native");
+   PkgIterator FindPkg(const string &Name);
+   PkgIterator FindPkg(const string &Name, string Arch);
 
    Header &Head() {return *HeaderP;};
+   inline GrpIterator GrpBegin();
+   inline GrpIterator GrpEnd();
    inline PkgIterator PkgBegin();
    inline PkgIterator PkgEnd();
    inline PkgFileIterator FileBegin();
@@ -274,7 +277,8 @@ struct pkgCache::Version						/*{{{*/
    map_ptrloc VerStr;            // Stringtable
    map_ptrloc Section;           // StringTable (StringItem)
    map_ptrloc Arch;              // StringTable
-   
+   enum {None, All, Foreign, Same, Allowed} MultiArch;
+
    // Lists
    map_ptrloc FileList;          // VerFile
    map_ptrloc NextVer;           // Version
@@ -337,6 +341,10 @@ struct pkgCache::StringItem						/*{{{*/
 									/*}}}*/
 #include <apt-pkg/cacheiterators.h>
 
+inline pkgCache::GrpIterator pkgCache::GrpBegin() 
+       {return GrpIterator(*this);};
+inline pkgCache::GrpIterator pkgCache::GrpEnd() 
+       {return GrpIterator(*this,GrpP);};
 inline pkgCache::PkgIterator pkgCache::PkgBegin() 
        {return PkgIterator(*this);};
 inline pkgCache::PkgIterator pkgCache::PkgEnd()