* removed the URL-Reamp hack (we have pdiff support in the main archive now), removed...

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

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index cde0920e64d60841fd05933d84cebbb6ccc55973..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.6 2001/04/29 05:13:51 jgg Exp $
+// $Id: policy.cc,v 1.10 2003/08/12 00:17:37 mdz Exp $

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


@@ -34,8 +34,12 @@
 #include <apt-pkg/sptr.h>
     
 #include <apti18n.h>
 #include <apt-pkg/sptr.h>
     
 #include <apti18n.h>

+
+#include <iostream>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+using namespace std;
+

 // Policy::Init - Startup and bind to a cache                          /*{{{*/
 // ---------------------------------------------------------------------
 /* Set the defaults for operation. The default mode with no loaded policy
 // Policy::Init - Startup and bind to a cache                          /*{{{*/
 // ---------------------------------------------------------------------
 /* Set the defaults for operation. The default mode with no loaded policy


@@ -117,7 +121,7 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator 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);

-      
+

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


@@ -164,7 +168,6 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
            break;
       }            
    }
            break;
       }            
    }

-   

    return Pref;
 }
                                                                        /*}}}*/
    return Pref;
 }
                                                                        /*}}}*/


@@ -177,24 +180,24 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
 void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
                          string Data,signed short Priority)
 {
 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)
    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

+      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)
       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)

-              P = I;
+              P = &*I;

         
         if (P == 0)
         
         if (P == 0)

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

       }
       else
       {
       }
       else
       {


@@ -217,7 +220,7 @@ pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator Pkg)
    if (PPkg.Type != pkgVersionMatch::None)
    {
       pkgVersionMatch Match(PPkg.Data,PPkg.Type);
    if (PPkg.Type != pkgVersionMatch::None)
    {
       pkgVersionMatch Match(PPkg.Data,PPkg.Type);

-        return Match.Find(Pkg);
+      return Match.Find(Pkg);

    }
    return pkgCache::VerIterator(*Pkg.Cache());
 }
    }
    return pkgCache::VerIterator(*Pkg.Cache());
 }


@@ -290,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();