Of *course* I managed to get this check backwards.

[apt.git] / apt-pkg / policy.cc

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 4711372bc4db61601711adf0207f5689a2643f44..3dd6ddac4798621e9194f86ca30fb771336284cb 100644 (file)
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -22,7 +22,6 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/sptr.h>

 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/versionmatch.h>


@@ -133,119 +132,21 @@ bool pkgPolicy::InitDefaults()
    best package is. */
 pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pkg)
 {
    best package is. */
 pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pkg)
 {

-   if (_config->FindI("APT::Policy", 1) >= 1) {
-      return GetCandidateVerNew(Pkg);
-   }
-
-   // Look for a package pin and evaluate it.
-   signed Max = GetPriority(Pkg);
-   pkgCache::VerIterator Pref = GetMatch(Pkg);
-
-   // Alternatives in case we can not find our package pin (Bug#512318).
-   signed MaxAlt = 0;
-   pkgCache::VerIterator PrefAlt;
-
-   // no package = no candidate version
-   if (Pkg.end() == true)
-      return Pref;
-
-   // packages with a pin lower than 0 have no newer candidate than the current version
-   if (Max < 0)
-      return Pkg.CurrentVer();
-
-   /* Falling through to the default version.. Setting Max to zero
-      effectively excludes everything <= 0 which are the non-automatic
-      priorities.. The status file is given a prio of 100 which will exclude
-      not-automatic sources, except in a single shot not-installed mode.
-
-      The user pin is subject to the same priority rules as default 
-      selections. Thus there are two ways to create a pin - a pin that
-      tracks the default when the default is taken away, and a permanent
-      pin that stays at that setting.
-    */
-   bool PrefSeen = false;
-   for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
-   {
-      /* Lets see if this version is the installed version */
-      bool instVer = (Pkg.CurrentVer() == Ver);
-
-      if (Pref == Ver)
-        PrefSeen = true;
-
-      for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; ++VF)
-      {
-        /* If this is the status file, and the current version is not the
-           version in the status file (ie it is not installed, or somesuch)
-           then it is not a candidate for installation, ever. This weeds
-           out bogus entries that may be due to config-file states, or
-           other. */
-        if (VF.File().Flagged(pkgCache::Flag::NotSource) && instVer == false)
-           continue;
-
-        signed Prio = PFPriority[VF.File()->ID];
-        if (Prio > Max)
-        {
-           Pref = Ver;
-           Max = Prio;
-           PrefSeen = true;
-        }
-        if (Prio > MaxAlt)
-        {
-           PrefAlt = Ver;
-           MaxAlt = Prio;
-        }
-      }
-
-      if (instVer == true && Max < 1000)
-      {
-        /* Not having seen the Pref yet means we have a specific pin below 1000
-           on a version below the current installed one, so ignore the specific pin
-           as this would be a downgrade otherwise */
-        if (PrefSeen == false || Pref.end() == true)
-        {
-           Pref = Ver;
-           PrefSeen = true;
-        }
-        /* Elevate our current selection (or the status file itself) so that only
-           a downgrade can override it from now on */
-        Max = 999;
-
-        // Fast path optimize.
-        if (StatusOverride == false)
-           break;
-      }
-   }
-   // If we do not find our candidate, use the one with the highest pin.
-   // This means that if there is a version available with pin > 0; there
-   // will always be a candidate (Closes: #512318)
-   if (!Pref.IsGood() && MaxAlt > 0)
-       Pref = PrefAlt;
-
-   return Pref;
-}
-
-// Policy::GetCandidateVer - Get the candidate install version         /*{{{*/
-// ---------------------------------------------------------------------
-/* Evaluate the package pins and the default list to deteremine what the
-   best package is. */
-pkgCache::VerIterator pkgPolicy::GetCandidateVerNew(pkgCache::PkgIterator const &Pkg)
-{
-   // TODO: Replace GetCandidateVer()

    pkgCache::VerIterator cand;
    pkgCache::VerIterator cur = Pkg.CurrentVer();
    int candPriority = -1;
    pkgVersioningSystem *vs = Cache->VS;
 
    pkgCache::VerIterator cand;
    pkgCache::VerIterator cur = Pkg.CurrentVer();
    int candPriority = -1;
    pkgVersioningSystem *vs = Cache->VS;
 

-   for (pkgCache::VerIterator ver = Pkg.VersionList(); ver.end() == false; ver++) {
-      int priority = GetPriority(ver);
+   for (pkgCache::VerIterator ver = Pkg.VersionList(); ver.end() == false; ++ver) {
+      int priority = GetPriority(ver, true);

 
 

-        if (priority == 0 || priority <= candPriority)
-           continue;
+      if (priority == 0 || priority <= candPriority)
+        continue;

 
 

-        // TODO: Maybe optimize to not compare versions
-        if (!cur.end() && priority < 1000
-           && (vs->CmpVersion(ver.VerStr(), cur.VerStr()) < 0))
-           continue;
+      // TODO: Maybe optimize to not compare versions
+      if (!cur.end() && priority < 1000
+         && (vs->CmpVersion(ver.VerStr(), cur.VerStr()) < 0))
+        continue;

 
       candPriority = priority;
       cand = ver;
 
       candPriority = priority;
       cand = ver;


@@ -279,14 +180,13 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
       Name.erase(found);
    }
 
       Name.erase(found);
    }
 

-   // Allow pinning by wildcards
-   // TODO: Maybe we should always prefer specific pins over non-
-   // specific ones.
-   if (Name[0] == '/' || Name.find_first_of("*[?") != string::npos)
+   // Allow pinning by wildcards - beware of package names looking like wildcards!
+   // TODO: Maybe we should always prefer specific pins over non-specific ones.
+   if ((Name[0] == '/' && Name[Name.length() - 1] == '/') || Name.find_first_of("*[?") != string::npos)

    {
       pkgVersionMatch match(Data, Type);
       for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() != true; ++G)
    {
       pkgVersionMatch match(Data, Type);
       for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() != true; ++G)

-        if (match.ExpressionMatches(Name, G.Name()))
+        if (Name != G.Name() && match.ExpressionMatches(Name, G.Name()))

         {
            if (Arch.empty() == false)
               CreatePin(Type, string(G.Name()).append(":").append(Arch), Data, Priority);
         {
            if (Arch.empty() == false)
               CreatePin(Type, string(G.Name()).append(":").append(Arch), Data, Priority);


@@ -323,7 +223,7 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
 
         // Find matching version(s) and copy the pin into it
         pkgVersionMatch Match(P->Data,P->Type);
 
         // Find matching version(s) and copy the pin into it
         pkgVersionMatch Match(P->Data,P->Type);

-        for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() != true; Ver++)
+        for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() != true; ++Ver)

         {
            if (Match.VersionMatches(Ver)) {
               Pin *VP = VerPins + Ver->ID;
         {
            if (Match.VersionMatches(Ver)) {
               Pin *VP = VerPins + Ver->ID;


@@ -368,14 +268,15 @@ APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)
       return Pins[Pkg->ID].Priority;
    return 0;
 }
       return Pins[Pkg->ID].Priority;
    return 0;
 }

-APT_PURE signed short pkgPolicy::GetPriority(pkgCache::VerIterator const &Ver, bool considerFiles)
+APT_PURE signed short pkgPolicy::GetPriority(pkgCache::VerIterator const &Ver, bool ConsiderFiles)

 {
    if (VerPins[Ver->ID].Type != pkgVersionMatch::None)
       return VerPins[Ver->ID].Priority;
 {
    if (VerPins[Ver->ID].Type != pkgVersionMatch::None)
       return VerPins[Ver->ID].Priority;

-   if (!considerFiles)
+   if (!ConsiderFiles)

       return 0;
 
       return 0;
 

-   int priority = std::numeric_limits<int>::min();
+   // priorities are short ints, but we want to pick a value outside the valid range here
+   auto priority = std::numeric_limits<signed int>::min();

    for (pkgCache::VerFileIterator file = Ver.FileList(); file.end() == false; file++)
    {
       /* If this is the status file, and the current version is not the
    for (pkgCache::VerFileIterator file = Ver.FileList(); file.end() == false; file++)
    {
       /* If this is the status file, and the current version is not the


@@ -383,14 +284,13 @@ APT_PURE signed short pkgPolicy::GetPriority(pkgCache::VerIterator const &Ver, b
          then it is not a candidate for installation, ever. This weeds
          out bogus entries that may be due to config-file states, or
          other. */
          then it is not a candidate for installation, ever. This weeds
          out bogus entries that may be due to config-file states, or
          other. */

-      if (file.File().Flagged(pkgCache::Flag::NotSource) && Ver.ParentPkg().CurrentVer() != Ver) {
-        // Ignore
-      } else if (GetPriority(file.File()) > priority) {
-        priority = GetPriority(file.File());
-      }
+      if (file.File().Flagged(pkgCache::Flag::NotSource) && Ver.ParentPkg().CurrentVer() != Ver)
+        priority = std::max(priority, static_cast<decltype(priority)>(-1));
+      else
+        priority = std::max(priority, static_cast<decltype(priority)>(GetPriority(file.File())));

    }
 
    }
 

-   return priority == std::numeric_limits<int>::min() ? 0 : priority;
+   return priority == std::numeric_limits<decltype(priority)>::min() ? 0 : priority;

 }
 APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
 {
 }
 APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
 {


@@ -406,15 +306,21 @@ APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &Fi
 bool ReadPinDir(pkgPolicy &Plcy,string Dir)
 {
    if (Dir.empty() == true)
 bool ReadPinDir(pkgPolicy &Plcy,string Dir)
 {
    if (Dir.empty() == true)

-      Dir = _config->FindDir("Dir::Etc::PreferencesParts");
+      Dir = _config->FindDir("Dir::Etc::PreferencesParts", "/dev/null");

 
    if (DirectoryExists(Dir) == false)
    {
 
    if (DirectoryExists(Dir) == false)
    {

-      _error->WarningE("DirectoryExists",_("Unable to read %s"),Dir.c_str());
+      if (APT::String::Endswith(Dir, "/dev/null") == false)
+        _error->WarningE("DirectoryExists",_("Unable to read %s"),Dir.c_str());

       return true;
    }
 
       return true;
    }
 

+   _error->PushToStack();

    vector<string> const List = GetListOfFilesInDir(Dir, "pref", true, true);
    vector<string> const List = GetListOfFilesInDir(Dir, "pref", true, true);

+   bool const PendingErrors = _error->PendingError();
+   _error->MergeWithStack();
+   if (PendingErrors)
+      return false;

 
    // Read the files
    for (vector<string>::const_iterator I = List.begin(); I != List.end(); ++I)
 
    // Read the files
    for (vector<string>::const_iterator I = List.begin(); I != List.end(); ++I)


@@ -438,11 +344,11 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
       return true;
    
    FileFd Fd(File,FileFd::ReadOnly);
       return true;
    
    FileFd Fd(File,FileFd::ReadOnly);

-   pkgTagFile TF(&Fd);
-   if (_error->PendingError() == true)
+   pkgTagFile TF(&Fd, pkgTagFile::SUPPORT_COMMENTS);
+   if (Fd.IsOpen() == false || Fd.Failed())

       return false;
 
       return false;
 

-   pkgUserTagSection Tags;
+   pkgTagSection Tags;

    while (TF.Step(Tags) == true)
    {
       // can happen when there are only comments in a record
    while (TF.Step(Tags) == true)
    {
       // can happen when there are only comments in a record


@@ -478,10 +384,13 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
       }
       for (; Word != End && isspace(*Word) != 0; Word++);
 
       }
       for (; Word != End && isspace(*Word) != 0; Word++);
 

-      int priority = Tags.FindI("Pin-Priority", 0);
+      _error->PushToStack();
+      int const priority = Tags.FindI("Pin-Priority", 0);
+      bool const newError = _error->PendingError();
+      _error->MergeWithStack();

       if (priority < std::numeric_limits<short>::min() ||
           priority > std::numeric_limits<short>::max() ||
       if (priority < std::numeric_limits<short>::min() ||
           priority > std::numeric_limits<short>::max() ||

-         _error->PendingError()) {
+         newError) {

         return _error->Error(_("%s: Value %s is outside the range of valid pin priorities (%d to %d)"),
                              File.c_str(), Tags.FindS("Pin-Priority").c_str(),
                              std::numeric_limits<short>::min(),
         return _error->Error(_("%s: Value %s is outside the range of valid pin priorities (%d to %d)"),
                              File.c_str(), Tags.FindS("Pin-Priority").c_str(),
                              std::numeric_limits<short>::min(),