* doc/examples/configure-index:

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

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 98439cd5777e58f34aa83e0d601359d362bbdd28..d8b8825c2400654ebc03d045a706683b3c2bf016 100644 (file)
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: policy.cc,v 1.8 2001/05/27 23:40:56 jgg Exp $
+// $Id: policy.cc,v 1.10 2003/08/12 00:17:37 mdz Exp $

 /* ######################################################################
 
    Package Version Policy implementation
 /* ######################################################################
 
    Package Version Policy implementation


@@ -183,7 +183,7 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
    Pin *P = 0;
    
    if (Name.empty() == true)
    Pin *P = 0;
    
    if (Name.empty() == true)

-      P = &*Defaults.insert(Defaults.end());
+      P = &*Defaults.insert(Defaults.end(),PkgPin());

    else
    {
       // Get a spot to put the pin
    else
    {
       // Get a spot to put the pin


@@ -197,7 +197,7 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
               P = &*I;
         
         if (P == 0)
               P = &*I;
         
         if (P == 0)

-           P = &*Unmatched.insert(Unmatched.end());      
+           P = &*Unmatched.insert(Unmatched.end(),PkgPin());      

       }
       else
       {
       }
       else
       {


@@ -293,8 +293,14 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
       }
       for (; Word != End && isspace(*Word) != 0; Word++);
 
       }
       for (; Word != End && isspace(*Word) != 0; Word++);
 

-      Plcy.CreatePin(Type,Name,string(Word,End),
-                    Tags.FindI("Pin-Priority"));
+      short int priority = Tags.FindI("Pin-Priority", 0);
+      if (priority == 0)
+      {
+         _error->Warning(_("No priority (or zero) specified for pin"));
+         continue;
+      }
+
+      Plcy.CreatePin(Type,Name,string(Word,End),priority);

    }
 
    Plcy.InitDefaults();
    }
 
    Plcy.InitDefaults();