implement apt-get source msg 'Please use: $vcs' for git

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

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index be96d4c844574c93756568b83e086e71058e2dec..bea4bec894d1a7befea9796e8c96c1bbf8340864 100644 (file)
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -4,37 +4,38 @@
 /* ######################################################################
 
    Package Version Policy implementation
 /* ######################################################################
 
    Package Version Policy implementation

-   
+

    This is just a really simple wrapper around pkgVersionMatch with
    some added goodies to manage the list of things..
    This is just a really simple wrapper around pkgVersionMatch with
    some added goodies to manage the list of things..

-   
-   Priority Table:
-   
-   1000 -> inf = Downgradeable priorities
-   1000        = The 'no downgrade' pseduo-status file
-   100 -> 1000 = Standard priorities
-   990         = Config file override package files
-   989         = Start for preference auto-priorities
-   500         = Default package files
-   100         = The status file and ButAutomaticUpgrades sources
-   0 -> 100    = NotAutomatic sources like experimental
-   -inf -> 0   = Never selected   
-   
+
+   See man apt_preferences for what value means what.
+

    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

 #include <apt-pkg/policy.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/configuration.h>

+#include <apt-pkg/cachefilter.h>

 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/sptr.h>
-
-#include <apti18n.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/versionmatch.h>
+#include <apt-pkg/version.h>

 
 

+#include <ctype.h>
+#include <stddef.h>
+#include <string.h>
+#include <string>
+#include <vector>

 #include <iostream>
 #include <sstream>
 #include <iostream>
 #include <sstream>

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 using namespace std;
                                                                        /*}}}*/
 
 using namespace std;


@@ -43,21 +44,40 @@ using namespace std;
 // ---------------------------------------------------------------------
 /* Set the defaults for operation. The default mode with no loaded policy
    file matches the V0 policy engine. */
 // ---------------------------------------------------------------------
 /* Set the defaults for operation. The default mode with no loaded policy
    file matches the V0 policy engine. */

-pkgPolicy::pkgPolicy(pkgCache *Owner) : Pins(0), PFPriority(0), Cache(Owner)
+pkgPolicy::pkgPolicy(pkgCache *Owner) : Pins(nullptr), VerPins(nullptr),
+   PFPriority(nullptr), Cache(Owner), d(NULL)

 {
 {

-   if (Owner == 0 || &(Owner->Head()) == 0)
+   if (Owner == 0)

       return;
    PFPriority = new signed short[Owner->Head().PackageFileCount];
    Pins = new Pin[Owner->Head().PackageCount];
       return;
    PFPriority = new signed short[Owner->Head().PackageFileCount];
    Pins = new Pin[Owner->Head().PackageCount];

+   VerPins = new Pin[Owner->Head().VersionCount];

 
    for (unsigned long I = 0; I != Owner->Head().PackageCount; I++)
       Pins[I].Type = pkgVersionMatch::None;
 
    for (unsigned long I = 0; I != Owner->Head().PackageCount; I++)
       Pins[I].Type = pkgVersionMatch::None;

+   for (unsigned long I = 0; I != Owner->Head().VersionCount; I++)
+      VerPins[I].Type = pkgVersionMatch::None;

 
    // The config file has a master override.
    string DefRel = _config->Find("APT::Default-Release");
    if (DefRel.empty() == false)
 
    // The config file has a master override.
    string DefRel = _config->Find("APT::Default-Release");
    if (DefRel.empty() == false)

-      CreatePin(pkgVersionMatch::Release,"",DefRel,990);
-      
+   {
+      bool found = false;
+      // FIXME: make ExpressionMatches static to use it here easily
+      pkgVersionMatch vm("", pkgVersionMatch::None);
+      for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)
+      {
+        if (vm.ExpressionMatches(DefRel, F.Archive()) ||
+            vm.ExpressionMatches(DefRel, F.Codename()) ||
+            vm.ExpressionMatches(DefRel, F.Version()) ||
+            (DefRel.length() > 2 && DefRel[1] == '='))
+           found = true;
+      }
+      if (found == false)
+        _error->Error(_("The value '%s' is invalid for APT::Default-Release as such a release is not available in the sources"), DefRel.c_str());
+      else
+        CreatePin(pkgVersionMatch::Release,"",DefRel,990);
+   }

    InitDefaults();
 }
                                                                        /*}}}*/
    InitDefaults();
 }
                                                                        /*}}}*/


@@ -67,51 +87,43 @@ pkgPolicy::pkgPolicy(pkgCache *Owner) : Pins(0), PFPriority(0), Cache(Owner)
 bool pkgPolicy::InitDefaults()
 {   
    // Initialize the priorities based on the status of the package file
 bool pkgPolicy::InitDefaults()
 {   
    // Initialize the priorities based on the status of the package file

-   for (pkgCache::PkgFileIterator I = Cache->FileBegin(); I != Cache->FileEnd(); I++)
+   for (pkgCache::PkgFileIterator I = Cache->FileBegin(); I != Cache->FileEnd(); ++I)

    {
       PFPriority[I->ID] = 500;
    {
       PFPriority[I->ID] = 500;

-      if ((I->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
+      if (I.Flagged(pkgCache::Flag::NotSource))

         PFPriority[I->ID] = 100;
         PFPriority[I->ID] = 100;

-      else if ((I->Flags & pkgCache::Flag::ButAutomaticUpgrades) == pkgCache::Flag::ButAutomaticUpgrades)
+      else if (I.Flagged(pkgCache::Flag::ButAutomaticUpgrades))

         PFPriority[I->ID] = 100;
         PFPriority[I->ID] = 100;

-      else if ((I->Flags & pkgCache::Flag::NotAutomatic) == pkgCache::Flag::NotAutomatic)
+      else if (I.Flagged(pkgCache::Flag::NotAutomatic))

         PFPriority[I->ID] = 1;
    }
 
    // Apply the defaults..
         PFPriority[I->ID] = 1;
    }
 
    // Apply the defaults..

-   SPtrArray<bool> Fixed = new bool[Cache->HeaderP->PackageFileCount];
-   memset(Fixed,0,sizeof(*Fixed)*Cache->HeaderP->PackageFileCount);
-   signed Cur = 989;
+   std::unique_ptr<bool[]> Fixed(new bool[Cache->HeaderP->PackageFileCount]);
+   memset(Fixed.get(),0,sizeof(Fixed[0])*Cache->HeaderP->PackageFileCount);

    StatusOverride = false;
    StatusOverride = false;

-   for (vector<Pin>::const_iterator I = Defaults.begin(); I != Defaults.end();
-       I++, Cur--)
+   for (vector<Pin>::const_iterator I = Defaults.begin(); I != Defaults.end(); ++I)

    {
       pkgVersionMatch Match(I->Data,I->Type);
    {
       pkgVersionMatch Match(I->Data,I->Type);

-      for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); F++)
+      for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)

       {
       {

-        if (Match.FileMatch(F) == true && Fixed[F->ID] == false)
+        if (Fixed[F->ID] == false && Match.FileMatch(F) == true)

         {
         {

-           if (I->Priority != 0 && I->Priority > 0)
-              Cur = I->Priority;
-           
-           if (I->Priority < 0)
-              PFPriority[F->ID] =  I->Priority;
-           else
-              PFPriority[F->ID] = Cur;
-           
-           if (PFPriority[F->ID] > 1000)
+           PFPriority[F->ID] = I->Priority;
+
+           if (PFPriority[F->ID] >= 1000)

               StatusOverride = true;
               StatusOverride = true;

-           
+

            Fixed[F->ID] = true;
            Fixed[F->ID] = true;

-        }      
-      }      
+        }
+      }

    }
 
    if (_config->FindB("Debug::pkgPolicy",false) == true)
    }
 
    if (_config->FindB("Debug::pkgPolicy",false) == true)

-      for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); F++)
-        std::clog << "Prio of " << F.FileName() << ' ' << PFPriority[F->ID] << std::endl; 
-   
-   return true;   
+      for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)
+        std::clog << "Prio of " << F.FileName() << ' ' << PFPriority[F->ID] << std::endl;
+
+   return true;

 }
                                                                        /*}}}*/
 // Policy::GetCandidateVer - Get the candidate install version         /*{{{*/
 }
                                                                        /*}}}*/
 // Policy::GetCandidateVer - Get the candidate install version         /*{{{*/


@@ -120,6 +132,10 @@ 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);
    // Look for a package pin and evaluate it.
    signed Max = GetPriority(Pkg);
    pkgCache::VerIterator Pref = GetMatch(Pkg);


@@ -140,28 +156,29 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pk
       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.
       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 second pseduo-status file is at prio 1000, above which will permit
-      the user to force-downgrade things.
-      
+

       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.
     */
       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.
     */

-   for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; Ver++)
+   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);
 
    {
       /* Lets see if this version is the installed version */
       bool instVer = (Pkg.CurrentVer() == Ver);
 

-      for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++)
+      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 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()->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource &&
-            instVer == false)
+        if (VF.File().Flagged(pkgCache::Flag::NotSource) && instVer == false)

            continue;
 
         signed Prio = PFPriority[VF.File()->ID];
            continue;
 
         signed Prio = PFPriority[VF.File()->ID];


@@ -169,26 +186,33 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pk
         {
            Pref = Ver;
            Max = Prio;
         {
            Pref = Ver;
            Max = Prio;

+           PrefSeen = true;

         }
         if (Prio > MaxAlt)
         {
            PrefAlt = Ver;
            MaxAlt = Prio;
         }
         if (Prio > MaxAlt)
         {
            PrefAlt = Ver;
            MaxAlt = Prio;

-        }       
-      }      
-      
+        }
+      }
+

       if (instVer == true && Max < 1000)
       {
       if (instVer == true && Max < 1000)
       {

-        /* Elevate our current selection (or the status file itself)
-           to the Pseudo-status priority. */
-        if (Pref.end() == true)
+        /* 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;
            Pref = Ver;

-        Max = 1000;
-        
+           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;
         // 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
    }
    // 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


@@ -198,6 +222,36 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pk
 
    return Pref;
 }
 
    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;
+
+   for (pkgCache::VerIterator ver = Pkg.VersionList(); ver.end() == false; ver++) {
+      int priority = GetPriority(ver, true);
+
+      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;
+
+      candPriority = priority;
+      cand = ver;
+   }
+
+   return cand;
+}

                                                                        /*}}}*/
 // Policy::CreatePin - Create an entry in the pin table..              /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // Policy::CreatePin - Create an entry in the pin table..              /*{{{*/
 // ---------------------------------------------------------------------


@@ -242,17 +296,44 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
    }
 
    // find the package (group) this pin applies to
    }
 
    // find the package (group) this pin applies to

-   pkgCache::GrpIterator Grp;
-   pkgCache::PkgIterator Pkg;
-   if (Arch.empty() == false)
-      Pkg = Cache->FindPkg(Name, Arch);
-   else {
-      Grp = Cache->FindGrp(Name);
-      if (Grp.end() == false)
-        Pkg = Grp.PackageList();
+   pkgCache::GrpIterator Grp = Cache->FindGrp(Name);
+   bool matched = false;
+   if (Grp.end() == false)
+   {
+      std::string MatchingArch;
+      if (Arch.empty() == true)
+        MatchingArch = Cache->NativeArch();
+      else
+        MatchingArch = Arch;
+      APT::CacheFilter::PackageArchitectureMatchesSpecification pams(MatchingArch);
+      for (pkgCache::PkgIterator Pkg = Grp.PackageList(); Pkg.end() != true; Pkg = Grp.NextPkg(Pkg))
+      {
+        if (pams(Pkg.Arch()) == false)
+           continue;
+        Pin *P = Pins + Pkg->ID;
+        // the first specific stanza for a package is the ruler,
+        // all others need to be ignored
+        if (P->Type != pkgVersionMatch::None)
+           P = &*Unmatched.insert(Unmatched.end(),PkgPin(Pkg.FullName()));
+        P->Type = Type;
+        P->Priority = Priority;
+        P->Data = Data;
+        matched = true;
+
+        // 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++)
+        {
+           if (Match.VersionMatches(Ver)) {
+              Pin *VP = VerPins + Ver->ID;
+              if (VP->Type == pkgVersionMatch::None)
+                 *VP = *P;
+           }
+        }
+      }

    }
 
    }
 

-   if (Pkg.end() == true)
+   if (matched == false)

    {
       PkgPin *P = &*Unmatched.insert(Unmatched.end(),PkgPin(Name));
       if (Arch.empty() == false)
    {
       PkgPin *P = &*Unmatched.insert(Unmatched.end(),PkgPin(Name));
       if (Arch.empty() == false)


@@ -262,20 +343,6 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
       P->Data = Data;
       return;
    }
       P->Data = Data;
       return;
    }

-
-   for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg))
-   {
-      Pin *P = Pins + Pkg->ID;
-      // the first specific stanza for a package is the ruler,
-      // all others need to be ignored
-      if (P->Type != pkgVersionMatch::None)
-        P = &*Unmatched.insert(Unmatched.end(),PkgPin(Pkg.FullName()));
-      P->Type = Type;
-      P->Priority = Priority;
-      P->Data = Data;
-      if (Grp.end() == true)
-        break;
-   }

 }
                                                                        /*}}}*/
 // Policy::GetMatch - Get the matching version for a package pin       /*{{{*/
 }
                                                                        /*}}}*/
 // Policy::GetMatch - Get the matching version for a package pin       /*{{{*/


@@ -294,37 +361,40 @@ pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator const &Pkg)
 // Policy::GetPriority - Get the priority of the package pin           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Policy::GetPriority - Get the priority of the package pin           /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)
+APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)

 {
    if (Pins[Pkg->ID].Type != pkgVersionMatch::None)
 {
    if (Pins[Pkg->ID].Type != pkgVersionMatch::None)

-   {
-      // In this case 0 means default priority
-      if (Pins[Pkg->ID].Priority == 0)
-        return 989;

       return Pins[Pkg->ID].Priority;
       return Pins[Pkg->ID].Priority;

-   }
-   

    return 0;
 }
    return 0;
 }

-signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
-{
-   return PFPriority[File->ID];
-}
-                                                                       /*}}}*/
-// PreferenceSection class - Overriding the default TrimRecord method  /*{{{*/
-// ---------------------------------------------------------------------
-/* The preference file is a user generated file so the parser should
-   therefore be a bit more friendly by allowing comments and new lines
-   all over the place rather than forcing a special format */
-class PreferenceSection : public pkgTagSection
+APT_PURE signed short pkgPolicy::GetPriority(pkgCache::VerIterator const &Ver, bool ConsiderFiles)

 {
 {

-   void TrimRecord(bool BeforeRecord, const char* &End)
+   if (VerPins[Ver->ID].Type != pkgVersionMatch::None)
+      return VerPins[Ver->ID].Priority;
+   if (!ConsiderFiles)
+      return 0;
+
+   int priority = std::numeric_limits<int>::min();
+   for (pkgCache::VerFileIterator file = Ver.FileList(); file.end() == false; file++)

    {
    {

-      for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r' || Stop[0] == '#'); Stop++)
-        if (Stop[0] == '#')
-           Stop = (const char*) memchr(Stop,'\n',End-Stop);
+      /* 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 (file.File().Flagged(pkgCache::Flag::NotSource) && Ver.ParentPkg().CurrentVer() != Ver) {
+        // Ignore
+      } else if (GetPriority(file.File()) > priority) {
+        priority = GetPriority(file.File());
+      }

    }
    }

-};
+
+   return priority == std::numeric_limits<int>::min() ? 0 : priority;
+}
+APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
+{
+   return PFPriority[File->ID];
+}

                                                                        /*}}}*/
 // ReadPinDir - Load the pin files from this dir into a Policy         /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // ReadPinDir - Load the pin files from this dir into a Policy         /*{{{*/
 // ---------------------------------------------------------------------


@@ -339,14 +409,15 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir)
 
    if (DirectoryExists(Dir) == false)
    {
 
    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;
    }
 
    vector<string> const List = GetListOfFilesInDir(Dir, "pref", true, true);
 
    // Read the files
       return true;
    }
 
    vector<string> const List = GetListOfFilesInDir(Dir, "pref", true, true);
 
    // Read the files

-   for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
+   for (vector<string>::const_iterator I = List.begin(); I != List.end(); ++I)

       if (ReadPinFile(Plcy, *I) == false)
         return false;
    return true;
       if (ReadPinFile(Plcy, *I) == false)
         return false;
    return true;


@@ -368,12 +439,16 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
    
    FileFd Fd(File,FileFd::ReadOnly);
    pkgTagFile TF(&Fd);
    
    FileFd Fd(File,FileFd::ReadOnly);
    pkgTagFile TF(&Fd);

-   if (_error->PendingError() == true)
+   if (Fd.IsOpen() == false || Fd.Failed())

       return false;
       return false;

-   
-   PreferenceSection Tags;
+
+   pkgUserTagSection Tags;

    while (TF.Step(Tags) == true)
    {
    while (TF.Step(Tags) == true)
    {

+      // can happen when there are only comments in a record
+      if (Tags.Count() == 0)
+         continue;
+

       string Name = Tags.FindS("Package");
       if (Name.empty() == true)
         return _error->Error(_("Invalid record in the preferences file %s, no Package header"), File.c_str());
       string Name = Tags.FindS("Package");
       if (Name.empty() == true)
         return _error->Error(_("Invalid record in the preferences file %s, no Package header"), File.c_str());


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

-      short 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() ||
+         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(),
+                             std::numeric_limits<short>::max());
+      }

       if (priority == 0)
       {
       if (priority == 0)
       {

-         _error->Warning(_("No priority (or zero) specified for pin"));
-         continue;
+         return _error->Error(_("No priority (or zero) specified for pin"));

       }
 
       istringstream s(Name);
       }
 
       istringstream s(Name);


@@ -423,3 +508,5 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+
+pkgPolicy::~pkgPolicy() {delete [] PFPriority; delete [] Pins; delete [] VerPins; }