* merged with mainline

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

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index a3bb4a38f6497316e1dba49af43d60f425635060..d8b8825c2400654ebc03d045a706683b3c2bf016 100644 (file)
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: policy.cc,v 1.7 2001/05/27 05:36:04 jgg Exp $
+// $Id: policy.cc,v 1.10 2003/08/12 00:17:37 mdz Exp $
 /* ######################################################################
 
    Package Version Policy implementation
@@ -168,9 +168,6 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
            break;
       }            
    }
-
-   if (Pref.end() == true)
-      return Pkg.VersionList();
    return Pref;
 }
                                                                        /*}}}*/
@@ -183,33 +180,24 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
 void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
                          string Data,signed short Priority)
 {
-   pkgCache::PkgIterator Pkg = Cache->FindPkg(Name);
    Pin *P = 0;
    
    if (Name.empty() == true)
-      // tausq:g++v3 begin
-       ;
-      // P = Defaults.insert(Defaults.end());
-      // tausq:g++v3 end
+      P = &*Defaults.insert(Defaults.end(),PkgPin());
    else
    {
       // Get a spot to put the pin
+      pkgCache::PkgIterator Pkg = Cache->FindPkg(Name);
       if (Pkg.end() == true)
       {
         // Check the unmatched table
         for (vector<PkgPin>::iterator I = Unmatched.begin(); 
              I != Unmatched.end() && P == 0; I++)
            if (I->Pkg == Name)
-               // tausq:g++-v3 begin
-              P = &(*I);
-              // P = I;
-               // tausq:g++-v3 end
+              P = &*I;
         
         if (P == 0)
-            // tausq:g++v3 begin
-            ;
-           // P = Unmatched.insert(Unmatched.end());      
-            // tausq:g++v3 end
+           P = &*Unmatched.insert(Unmatched.end(),PkgPin());      
       }
       else
       {
@@ -305,8 +293,14 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
       }
       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();