Merge 0.7.7 release

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

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index da72f193a2eb6f3088b14a33449b81462966018c..8b083fd444aa80e8d8b9c4314a12a7802c879470 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.5 2001/03/13 05:23:42 jgg Exp $
+// $Id: policy.cc,v 1.10 2003/08/12 00:17:37 mdz Exp $

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


@@ -23,9 +23,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/policy.h"
-#endif

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


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

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

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

+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


@@ -83,10 +85,6 @@ bool pkgPolicy::InitDefaults()
       pkgVersionMatch Match(I->Data,I->Type);
       for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); F++)
       {
       pkgVersionMatch Match(I->Data,I->Type);
       for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); F++)
       {

-/* hmm?
- if ((F->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
-           continue;*/
-

         if (Match.FileMatch(F) == true && Fixed[F->ID] == false)
         {
            if (I->Priority != 0 && I->Priority > 0)
         if (Match.FileMatch(F) == true && Fixed[F->ID] == false)
         {
            if (I->Priority != 0 && I->Priority > 0)


@@ -118,20 +116,10 @@ bool pkgPolicy::InitDefaults()
    best package is. */
 pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
 {
    best package is. */
 pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
 {

-   const Pin &PPkg = Pins[Pkg->ID];
-   

    // Look for a package pin and evaluate it.
    // Look for a package pin and evaluate it.

-   signed Max = 0;
-   pkgCache::VerIterator Pref(*Cache);
-   if (PPkg.Type != pkgVersionMatch::None)
-   {
-      pkgVersionMatch Match(PPkg.Data,PPkg.Type);
-      Pref = Match.Find(Pkg);
-      Max = PPkg.Priority;
-      if (PPkg.Priority == 0)
-        Max = 989;
-   }
-      
+   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


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

-   

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


@@ -191,24 +178,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
       {


@@ -222,6 +209,36 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
    P->Data = Data;
 }
                                                                        /*}}}*/
    P->Data = Data;
 }
                                                                        /*}}}*/

+// Policy::GetMatch - Get the matching version for a package pin       /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator Pkg)
+{
+   const Pin &PPkg = Pins[Pkg->ID];
+   if (PPkg.Type != pkgVersionMatch::None)
+   {
+      pkgVersionMatch Match(PPkg.Data,PPkg.Type);
+      return Match.Find(Pkg);
+   }
+   return pkgCache::VerIterator(*Pkg.Cache());
+}
+                                                                       /*}}}*/
+// Policy::GetPriority - Get the priority of the package pin           /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)
+{
+   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 0;
+}
+                                                                       /*}}}*/

 
 // ReadPinFile - Load the pin file into a Policy                       /*{{{*/
 // ---------------------------------------------------------------------
 
 // ReadPinFile - Load the pin file into a Policy                       /*{{{*/
 // ---------------------------------------------------------------------


@@ -274,8 +291,20 @@ 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;
+      }
+
+      istringstream s(Name);
+      string pkg;
+      while(!s.eof())
+      {
+        s >> pkg;
+         Plcy.CreatePin(Type, pkg, string(Word,End),priority);
+      };

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