Add with pkgCacheGen::Essential a way to control which packages get the

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

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 84eab44a7f16b8201b09264944367cfea6659d8d..947e060e31e20ad7f81d3068a2d1d7dd71eb56d6 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -255,9 +255,13 @@ bool debListParser::UsePackage(pkgCache::PkgIterator Pkg,
    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)


@@ -333,7 +337,13 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
    const char *Stop;
    if (Section.Find("Status",Start,Stop) == false)
       return true;
    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++);


@@ -609,7 +619,10 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver,
    const char *Stop;
    if (Section.Find(Tag,Start,Stop) == false)
       return true;
    const char *Stop;
    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;


@@ -620,8 +633,18 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver,
       Start = ParseDepends(Start,Stop,Package,Version,Op);
       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);
       Start = ParseDepends(Start,Stop,Package,Version,Op);
       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);

-      
-      if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false)
+
+      if (multiArch == true &&
+         (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)
+           if (NewDepends(Ver,Package,*a,Version,Op,Type) == false)
+              return false;
+      }
+      else if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false)

         return false;
       if (Start == Stop)
         break;
         return false;
       if (Start == Stop)
         break;