From e2bba11c9a1858c98954e7c5299d20a6c0966cc7 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 29 Jun 2011 23:26:38 +0200
Subject:   - ensure that only the first specific stanza for a package is used 
  - save all stanzas which had no effect in Unmatched

---
 apt-pkg/policy.cc | 27 ++++++++++++---------------
 apt-pkg/policy.h  |  1 +
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 827c9145c..78f44d635 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -229,28 +229,25 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
       return;
    }
 
-   // Get a spot to put the pin
+   // find the package group this pin applies to
    pkgCache::GrpIterator Grp = Cache->FindGrp(Name);
    if (Grp.end() == true)
+   {
+      Pin *P = &*Unmatched.insert(Unmatched.end(),PkgPin(Name));
+      P->Type = Type;
+      P->Priority = Priority;
+      P->Data = Data;
       return;
+   }
 
    for (pkgCache::PkgIterator Pkg = Grp.PackageList();
 	Pkg.end() != true; Pkg = Grp.NextPkg(Pkg))
    {
-      Pin *P = 0;
-      if (Pkg.end() == false)
-	 P = Pins + Pkg->ID;
-      else
-      {
-	 // Check the unmatched table
-	 for (vector<PkgPin>::iterator I = Unmatched.begin();
-	      I != Unmatched.end() && P == 0; I++)
-	    if (I->Pkg == Name)
-	       P = &*I;
-
-	 if (P == 0)
-	    P = &*Unmatched.insert(Unmatched.end(),PkgPin());
-      }
+      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;
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index f8b2678de..a5e6c6048 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -55,6 +55,7 @@ class pkgPolicy : public pkgDepCache::Policy
    struct PkgPin : Pin
    {
       string Pkg;
+      PkgPin(string const &Pkg) : Pin(), Pkg(Pkg) {};
    };
    
    Pin *Pins;
-- 
cgit v1.2.3