X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/88a8975f156e452d9f3ebe76822b236e8962ebba..69cea1ef2cfda3c4da79fd756a8edaf2be26998e:/apt-pkg/policy.cc

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index eaa72f084..7c57f9dea 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -33,6 +33,7 @@
 #include <string>
 #include <vector>
 #include <iostream>
+#include <sstream>
 
 #include <apti18n.h>
 									/*}}}*/
@@ -221,8 +222,8 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pk
 
    return Pref;
 }
-
-// Policy::GetCandidateVer - Get the candidate install version		/*{{{*/
+									/*}}}*/
+// Policy::GetCandidateVerNew - Get the candidate install version	/*{{{*/
 // ---------------------------------------------------------------------
 /* Evaluate the package pins and the default list to deteremine what the
    best package is. */
@@ -234,16 +235,16 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVerNew(pkgCache::PkgIterator const
    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;
@@ -321,7 +322,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);
-	 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;
@@ -373,7 +374,7 @@ APT_PURE signed short pkgPolicy::GetPriority(pkgCache::VerIterator const &Ver, b
    if (!ConsiderFiles)
       return 0;
 
-   int priority = std::numeric_limits<int>::min();
+   signed short priority = std::numeric_limits<signed short>::min();
    for (pkgCache::VerFileIterator file = Ver.FileList(); file.end() == false; file++)
    {
       /* If this is the status file, and the current version is not the
@@ -381,14 +382,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. */
-      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, 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)
 {
@@ -408,7 +408,8 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir)
 
    if (DirectoryExists(Dir) == false)
    {
-      _error->WarningE("DirectoryExists",_("Unable to read %s"),Dir.c_str());
+      if (Dir != "/dev/null")
+	 _error->WarningE("DirectoryExists",_("Unable to read %s"),Dir.c_str());
       return true;
    }
 
@@ -436,11 +437,11 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
       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;
 
-   pkgUserTagSection Tags;
+   pkgTagSection Tags;
    while (TF.Step(Tags) == true)
    {
       // can happen when there are only comments in a record
@@ -476,10 +477,13 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
       }
       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() ||
-	  _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(),