merged from apt-get-changelog

[apt.git] / apt-pkg / deb / deblistparser.cc

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 5c9cf6d4bfe79c27ebd5c4061f3008360c4a453b..1b3bfd6ae492c77deff4ea208403d3081f9e4f90 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -19,6 +19,7 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/macros.h>
 
 #include <apt-pkg/md5.h>
 #include <apt-pkg/macros.h>
 

+#include <fnmatch.h>

 #include <ctype.h>
                                                                        /*}}}*/
 
 #include <ctype.h>
                                                                        /*}}}*/
 


@@ -36,8 +37,10 @@ static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Impor
    we would accept in general with checkArchitecture() */
 debListParser::debListParser(FileFd *File, string const &Arch) : Tags(File),
                                Arch(Arch) {
    we would accept in general with checkArchitecture() */
 debListParser::debListParser(FileFd *File, string const &Arch) : Tags(File),
                                Arch(Arch) {

-       if (Arch == "native")
-               this->Arch = _config->Find("APT::Architecture");
+   if (Arch == "native")
+      this->Arch = _config->Find("APT::Architecture");
+   Architectures = APT::Configuration::getArchitectures();
+   MultiArchEnabled = Architectures.size() > 1;

 }
                                                                        /*}}}*/
 // ListParser::UniqFindTagWrite - Find the tag and write a unq string  /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::UniqFindTagWrite - Find the tag and write a unq string  /*{{{*/


@@ -56,10 +59,10 @@ unsigned long debListParser::UniqFindTagWrite(const char *Tag)
 // ---------------------------------------------------------------------
 /* This is to return the name of the package this section describes */
 string debListParser::Package() {
 // ---------------------------------------------------------------------
 /* This is to return the name of the package this section describes */
 string debListParser::Package() {

-       string const Result = Section.FindS("Package");
-       if(unlikely(Result.empty() == true))
-               _error->Error("Encountered a section with no Package: header");
-       return Result;
+   string const Result = Section.FindS("Package");
+   if(unlikely(Result.empty() == true))
+      _error->Error("Encountered a section with no Package: header");
+   return Result;

 }
                                                                        /*}}}*/
 // ListParser::Architecture - Return the package arch                  /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::Architecture - Return the package arch                  /*{{{*/


@@ -68,25 +71,26 @@ string debListParser::Package() {
    Note that architecture "all" packages will get the architecture of the
    Packages file parsed here. */
 string debListParser::Architecture() {
    Note that architecture "all" packages will get the architecture of the
    Packages file parsed here. */
 string debListParser::Architecture() {

-       string const Result = Section.FindS("Architecture");
-       if (Result.empty() == true || Result == "all") {
-               if (Arch.empty() == true)
-                       /* FIXME: this is a problem for installed arch all
-                          packages as we don't know from which arch this
-                          package was installed - and therefore which
-                          dependency this package resolves. */
-                       return _config->Find("APT::Architecture");
-               else
-                       return Arch;
-       }
-       return Result;
+   string const Result = Section.FindS("Architecture");
+   if (Result.empty() == true || Result == "all")
+   {
+      if (Arch.empty() == true)
+        /* FIXME: this is a problem for installed arch all
+           packages as we don't know from which arch this
+           package was installed - and therefore which
+           dependency this package resolves. */
+        return _config->Find("APT::Architecture");
+      else
+        return Arch;
+   }
+   return Result;

 }
                                                                        /*}}}*/
 // ListParser::ArchitectureAll                                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool debListParser::ArchitectureAll() {
 }
                                                                        /*}}}*/
 // ListParser::ArchitectureAll                                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool debListParser::ArchitectureAll() {

-       return Section.FindS("Architecture") == "all";
+   return Section.FindS("Architecture") == "all";

 }
                                                                        /*}}}*/
 // ListParser::Version - Return the version string                     /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::Version - Return the version string                     /*{{{*/


@@ -102,7 +106,7 @@ string debListParser::Version()
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool debListParser::NewVersion(pkgCache::VerIterator Ver)
+bool debListParser::NewVersion(pkgCache::VerIterator &Ver)

 {
    // Parse the section
    Ver->Section = UniqFindTagWrite("Section");
 {
    // Parse the section
    Ver->Section = UniqFindTagWrite("Section");


@@ -132,10 +136,9 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver)
    }
 
    // Archive Size
    }
 
    // Archive Size

-   Ver->Size = (unsigned)Section.FindI("Size");
-   
+   Ver->Size = Section.FindULL("Size");

    // Unpacked Size (in K)
    // Unpacked Size (in K)

-   Ver->InstalledSize = (unsigned)Section.FindI("Installed-Size");
+   Ver->InstalledSize = Section.FindULL("Installed-Size");

    Ver->InstalledSize *= 1024;
 
    // Priority
    Ver->InstalledSize *= 1024;
 
    // Priority


@@ -155,10 +158,9 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver)
         to a NOP in the download/install step - this package will ensure that
         it is downloaded only one time and installed only one time -- even if
         the architecture bound versions coming in and out on regular basis. */
         to a NOP in the download/install step - this package will ensure that
         it is downloaded only one time and installed only one time -- even if
         the architecture bound versions coming in and out on regular basis. */

-      bool const static multiArch = APT::Configuration::getArchitectures().size() > 1;

       if (strcmp(Ver.Arch(true),"all") == 0)
         return true;
       if (strcmp(Ver.Arch(true),"all") == 0)
         return true;

-      else if (multiArch == true)
+      else if (MultiArchEnabled == true)

       {
         // our pseudo packages have no size to not confuse the fetcher
         Ver->Size = 0;
       {
         // our pseudo packages have no size to not confuse the fetcher
         Ver->Size = 0;


@@ -249,15 +251,19 @@ MD5SumValue debListParser::Description_md5()
 // ---------------------------------------------------------------------
 /* This is called to update the package with any new information 
    that might be found in the section */
 // ---------------------------------------------------------------------
 /* This is called to update the package with any new information 
    that might be found in the section */

-bool debListParser::UsePackage(pkgCache::PkgIterator Pkg,
-                              pkgCache::VerIterator Ver)
+bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg,
+                              pkgCache::VerIterator &Ver)

 {
    if (Pkg->Section == 0)
       Pkg->Section = UniqFindTagWrite("Section");
 
 {
    if (Pkg->Section == 0)
       Pkg->Section = UniqFindTagWrite("Section");
 

-   // Packages which are not from "our" arch doesn't get the essential flag
+   // Packages which are not from the "native" arch doesn't get the essential flag
+   // in the default "native" mode - it is also possible to mark "all" or "none".
+   // The "installed" mode is handled by ParseStatus(), See #544481 and friends.

    string const static myArch = _config->Find("APT::Architecture");
    string const static myArch = _config->Find("APT::Architecture");

-   if (Pkg->Arch != 0 && myArch == Pkg.Arch())
+   string const static essential = _config->Find("pkgCacheGen::Essential", "native");
+   if ((essential == "native" && Pkg->Arch != 0 && myArch == Pkg.Arch()) ||
+       essential == "all")

       if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false)
         return false;
    if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false)
       if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false)
         return false;
    if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false)


@@ -326,14 +332,20 @@ unsigned short debListParser::VersionHash()
    Some of the above are obsolete (I think?) flag = hold-* and 
    status = post-inst-failed, removal-failed at least.
  */
    Some of the above are obsolete (I think?) flag = hold-* and 
    status = post-inst-failed, removal-failed at least.
  */

-bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
-                               pkgCache::VerIterator Ver)
+bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
+                               pkgCache::VerIterator &Ver)

 {
    const char *Start;
    const char *Stop;
    if (Section.Find("Status",Start,Stop) == false)
       return true;
 {
    const char *Start;
    const char *Stop;
    if (Section.Find("Status",Start,Stop) == false)
       return true;

-   
+
+   // UsePackage() is responsible for setting the flag in the default case
+   bool const static essential = _config->Find("pkgCacheGen::Essential", "") == "installed";
+   if (essential == true &&
+       Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false)
+      return false;
+

    // Isolate the first word
    const char *I = Start;
    for(; I < Stop && *I != ' '; I++);
    // Isolate the first word
    const char *I = Start;
    for(; I < Stop && *I != ' '; I++);


@@ -462,6 +474,21 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
    return I;
 }
 
    return I;
 }
 

+/*
+ * CompleteArch:
+ *
+ * The complete architecture, consisting of <kernel>-<cpu>.
+ */
+static string CompleteArch(std::string& arch) {
+    if (arch == "armel")              return "linux-arm";
+    if (arch == "armhf")              return "linux-arm";
+    if (arch == "lpia")               return "linux-i386";
+    if (arch == "powerpcspe")         return "linux-powerpc";
+    if (arch == "uclibc-linux-armel") return "linux-arm";
+    if (arch == "uclinux-armel")      return "uclinux-arm";
+
+    return (arch.find("-") != string::npos) ? arch : "linux-" + arch;
+}

                                                                        /*}}}*/
 // ListParser::ParseDepends - Parse a dependency element               /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // ListParser::ParseDepends - Parse a dependency element               /*{{{*/
 // ---------------------------------------------------------------------


@@ -535,6 +562,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
    if (ParseArchFlags == true)
    {
       string arch = _config->Find("APT::Architecture");
    if (ParseArchFlags == true)
    {
       string arch = _config->Find("APT::Architecture");

+      string completeArch = CompleteArch(arch);

 
       // Parse an architecture
       if (I != Stop && *I == '[')
 
       // Parse an architecture
       if (I != Stop && *I == '[')


@@ -562,8 +590,13 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
               I++;
             }
 
               I++;
             }
 

-           if (stringcmp(arch,I,End) == 0)
+           if (stringcmp(arch,I,End) == 0) {

               Found = true;
               Found = true;

+           } else {
+              std::string wildcard = SubstVar(string(I, End), "any", "*");
+              if (fnmatch(wildcard.c_str(), completeArch.c_str(), 0) == 0)
+                 Found = true;
+           }

            
            if (*End++ == ']') {
               I = End;
            
            if (*End++ == ']') {
               I = End;


@@ -602,7 +635,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
 // ---------------------------------------------------------------------
 /* This is the higher level depends parser. It takes a tag and generates
    a complete depends tree for the given version. */
 // ---------------------------------------------------------------------
 /* This is the higher level depends parser. It takes a tag and generates
    a complete depends tree for the given version. */

-bool debListParser::ParseDepends(pkgCache::VerIterator Ver,
+bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,

                                 const char *Tag,unsigned int Type)
 {
    const char *Start;
                                 const char *Tag,unsigned int Type)
 {
    const char *Start;


@@ -610,9 +643,6 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver,
    if (Section.Find(Tag,Start,Stop) == false)
       return true;
 
    if (Section.Find(Tag,Start,Stop) == false)
       return true;
 

-   static std::vector<std::string> const archs = APT::Configuration::getArchitectures();
-   static bool const multiArch = archs.size() <= 1;
-

    string Package;
    string const pkgArch = Ver.Arch(true);
    string Version;
    string Package;
    string const pkgArch = Ver.Arch(true);
    string Version;


@@ -624,13 +654,13 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver,
       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);
 
       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);
 

-      if (multiArch == true &&
+      if (MultiArchEnabled == true &&

          (Type == pkgCache::Dep::Conflicts ||
           Type == pkgCache::Dep::DpkgBreaks ||
           Type == pkgCache::Dep::Replaces))
       {
          (Type == pkgCache::Dep::Conflicts ||
           Type == pkgCache::Dep::DpkgBreaks ||
           Type == pkgCache::Dep::Replaces))
       {

-        for (std::vector<std::string>::const_iterator a = archs.begin();
-             a != archs.end(); ++a)
+        for (std::vector<std::string>::const_iterator a = Architectures.begin();
+             a != Architectures.end(); ++a)

            if (NewDepends(Ver,Package,*a,Version,Op,Type) == false)
               return false;
       }
            if (NewDepends(Ver,Package,*a,Version,Op,Type) == false)
               return false;
       }


@@ -645,7 +675,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver,
 // ListParser::ParseProvides - Parse the provides list                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ListParser::ParseProvides - Parse the provides list                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool debListParser::ParseProvides(pkgCache::VerIterator Ver)
+bool debListParser::ParseProvides(pkgCache::VerIterator &Ver)

 {
    const char *Start;
    const char *Stop;
 {
    const char *Start;
    const char *Stop;


@@ -682,14 +712,13 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver)
    if (Ver->MultiArch != pkgCache::Version::Foreign)
       return true;
 
    if (Ver->MultiArch != pkgCache::Version::Foreign)
       return true;
 

-   std::vector<string> const archs = APT::Configuration::getArchitectures();
-   if (archs.size() <= 1)
+   if (MultiArchEnabled == false)

       return true;
 
    string const Package = Ver.ParentPkg().Name();
    string const Version = Ver.VerStr();
       return true;
 
    string const Package = Ver.ParentPkg().Name();
    string const Version = Ver.VerStr();

-   for (std::vector<string>::const_iterator a = archs.begin();
-       a != archs.end(); ++a)
+   for (std::vector<string>::const_iterator a = Architectures.begin();
+       a != Architectures.end(); ++a)

    {
       if (NewProvides(Ver, Package, *a, Version) == false)
         return false;
    {
       if (NewProvides(Ver, Package, *a, Version) == false)
         return false;


@@ -729,7 +758,7 @@ bool debListParser::Step()
       if (Architecture.empty() == true)
         return true;
 
       if (Architecture.empty() == true)
         return true;
 

-      if (Arch.empty() == true)
+      if (Arch.empty() == true || Arch == "any" || MultiArchEnabled == false)

       {
         if (APT::Configuration::checkArchitecture(Architecture) == true)
            return true;
       {
         if (APT::Configuration::checkArchitecture(Architecture) == true)
            return true;


@@ -751,7 +780,7 @@ bool debListParser::Step()
 // ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI,
+bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,

                                    FileFd &File, string component)
 {
    pkgTagFile Tags(&File, File.Size() + 256); // XXX
                                    FileFd &File, string component)
 {
    pkgTagFile Tags(&File, File.Size() + 256); // XXX


@@ -787,6 +816,12 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI,
    if (Section.FindFlag("NotAutomatic",FileI->Flags,
                        pkgCache::Flag::NotAutomatic) == false)
       _error->Warning("Bad NotAutomatic flag");
    if (Section.FindFlag("NotAutomatic",FileI->Flags,
                        pkgCache::Flag::NotAutomatic) == false)
       _error->Warning("Bad NotAutomatic flag");

+   if (Section.FindFlag("ButAutomaticUpgrades",FileI->Flags,
+                       pkgCache::Flag::ButAutomaticUpgrades) == false)
+      _error->Warning("Bad ButAutomaticUpgrades flag");
+   // overrule the NotAutomatic setting if needed as they are both present for compatibility
+   else if ((FileI->Flags & pkgCache::Flag::ButAutomaticUpgrades) == pkgCache::Flag::ButAutomaticUpgrades)
+      FileI->Flags &= ~pkgCache::Flag::NotAutomatic;

 
    return !_error->PendingError();
 }
 
    return !_error->PendingError();
 }