Drop the Arch information from the Version structure as we can get

the information from the parent package now

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 33d2ed6be655f21a4345a6cad340a64398d4a57e..d8e044f88f8938a9192dfcc1628c763f76af9748 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -178,7 +178,7 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
        // Accessors
        inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;};
        inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;};
        // Accessors
        inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;};
        inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;};

-       inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;};
+       inline const char *Arch() const {return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;};

        inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
 
        inline DescIterator DescriptionList() const;
        inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
 
        inline DescIterator DescriptionList() const;

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index f683de423f74417fdd098cce9d2f7295699d7f1c..26841d3d2a0fc45ae37258435042973d2226a5ac 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -83,6 +83,13 @@ string debListParser::Architecture() {
        return Result;
 }
                                                                        /*}}}*/
        return Result;
 }
                                                                        /*}}}*/

+// ListParser::ArchitectureAll                                         /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool debListParser::ArchitectureAll() {
+       return Section.FindS("Architecture") == "all";
+}
+                                                                       /*}}}*/

 // ListParser::Version - Return the version string                     /*{{{*/
 // ---------------------------------------------------------------------
 /* This is to return the string describing the version in debian form,
 // ListParser::Version - Return the version string                     /*{{{*/
 // ---------------------------------------------------------------------
 /* This is to return the string describing the version in debian form,


@@ -101,9 +108,6 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver)
    // Parse the section
    Ver->Section = UniqFindTagWrite("Section");
 
    // Parse the section
    Ver->Section = UniqFindTagWrite("Section");
 

-   // Parse the architecture
-   Ver->Arch = WriteUniqString(Architecture());
-

    // Parse multi-arch
    if (Section.FindS("Architecture") == "all")
       /* Arch all packages can't have a Multi-Arch field,
    // Parse multi-arch
    if (Section.FindS("Architecture") == "all")
       /* Arch all packages can't have a Multi-Arch field,

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index cba4f8e5da55cf2d6cc81f9f061a7083ff0da79e..8da051530fd06cf9b60e5a25e318a90ee733c64d 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -47,6 +47,7 @@ class debListParser : public pkgCacheGenerator::ListParser
    // These all operate against the current section
    virtual string Package();
    virtual string Architecture();
    // These all operate against the current section
    virtual string Package();
    virtual string Architecture();

+   virtual bool ArchitectureAll();

    virtual string Version();
    virtual bool NewVersion(pkgCache::VerIterator Ver);
    virtual string Description();
    virtual string Version();
    virtual bool NewVersion(pkgCache::VerIterator Ver);
    virtual string Description();

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 1e4c7edb3825ac4f2c8c72f63e07e3846eac6b0b..7d98869ea101491ed7ee1a1904b0acbda4bdbb57 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -399,7 +399,7 @@ const char *
 pkgCache::PkgIterator::CandVersion() const 
 {
   //TargetVer is empty, so don't use it.
 pkgCache::PkgIterator::CandVersion() const 
 {
   //TargetVer is empty, so don't use it.

-  VerIterator version = pkgPolicy::pkgPolicy(Owner).GetCandidateVer(*this);
+  VerIterator version = pkgPolicy(Owner).GetCandidateVer(*this);

   if (version.IsGood())
     return version.VerStr();
   return 0;
   if (version.IsGood())
     return version.VerStr();
   return 0;


@@ -727,7 +727,7 @@ string pkgCache::VerIterator::RelStr()
            Res += File.Site();
       }      
    }
            Res += File.Site();
       }      
    }

-   if (S->Arch != 0)
+   if (S->ParentPkg != 0)

       Res.append(" [").append(Arch()).append("]");
    return Res;
 }
       Res.append(" [").append(Arch()).append("]");
    return Res;
 }

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 5f50001d0cce1cc6bb9735057a308bd1af90e711..5edeedfd12f57e1802261f3b24682525b4dbeac3 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -276,7 +276,6 @@ struct pkgCache::Version                                            /*{{{*/
 {
    map_ptrloc VerStr;            // Stringtable
    map_ptrloc Section;           // StringTable (StringItem)
 {
    map_ptrloc VerStr;            // Stringtable
    map_ptrloc Section;           // StringTable (StringItem)

-   map_ptrloc Arch;              // StringTable

    enum {None, All, Foreign, Same, Allowed} MultiArch;
 
    // Lists
    enum {None, All, Foreign, Same, Allowed} MultiArch;
 
    // Lists

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 53f09b99123adf76f78e4dbd84ae5c832b7ccd50..ca5d74a9fbada2ec9d33a8014865d217cab5584d 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -112,6 +112,7 @@ class pkgCacheGenerator::ListParser
    // These all operate against the current section
    virtual string Package() = 0;
    virtual string Architecture() = 0;
    // These all operate against the current section
    virtual string Package() = 0;
    virtual string Architecture() = 0;

+   virtual bool ArchitectureAll() = 0;

    virtual string Version() = 0;
    virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
    virtual string Description() = 0;
    virtual string Version() = 0;
    virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
    virtual string Description() = 0;