take from, ignore from can have full IDs

5 files changed, 23 insertions, 15 deletions

diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index e937a2dfd..15e4bb933 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -1163,7 +1163,7 @@ Decider::_add_dependencies_if_necessary(
     {
         Context context_2("When handling dependency '" + stringify(s->spec()) + "':");
 
-        SpecInterest interest(_interest_in_spec(our_resolution, *s));
+        SpecInterest interest(_interest_in_spec(our_resolution, package_id, *s));
 
         switch (interest)
         {
@@ -1206,9 +1206,12 @@ Decider::_add_dependencies_if_necessary(
 }
 
 SpecInterest
-Decider::_interest_in_spec(const std::shared_ptr<const Resolution> & resolution, const SanitisedDependency & dep) const
+Decider::_interest_in_spec(
+        const std::shared_ptr<const Resolution> & resolution,
+        const std::shared_ptr<const PackageID> & id,
+        const SanitisedDependency & dep) const
 {
-    return _imp->fns.interest_in_spec_fn()(resolution, dep);
+    return _imp->fns.interest_in_spec_fn()(resolution, id, dep);
 }
 
 const std::shared_ptr<Constraints>
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index 139865325..c3f1d9ce4 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -208,6 +208,7 @@ namespace paludis
 
                 SpecInterest _interest_in_spec(
                         const std::shared_ptr<const Resolution> &,
+                        const std::shared_ptr<const PackageID> &,
                         const SanitisedDependency &) const;
 
                 const std::shared_ptr<Constraints> _initial_constraints_for(const Resolvent &) const;
diff --git a/paludis/resolver/interest_in_spec_helper.cc b/paludis/resolver/interest_in_spec_helper.cc
index 76d7192e2..978172036 100644
--- a/paludis/resolver/interest_in_spec_helper.cc
+++ b/paludis/resolver/interest_in_spec_helper.cc
@@ -36,6 +36,7 @@
 #include <paludis/environment.hh>
 #include <paludis/package_dep_spec_collection.hh>
 #include <paludis/metadata_key.hh>
+#include <paludis/match_package.hh>
 #include <list>
 
 using namespace paludis;
@@ -230,6 +231,7 @@ namespace
 SpecInterest
 InterestInSpecHelper::operator() (
         const std::shared_ptr<const Resolution> & resolution,
+        const std::shared_ptr<const PackageID> & id,
         const SanitisedDependency & dep) const
 {
     CareAboutDepFnVisitor v{_imp->env, _imp->no_blockers_from_specs, _imp->no_dependencies_from_specs,
@@ -242,33 +244,33 @@ InterestInSpecHelper::operator() (
         if (! (suggestion || recommendation))
             return si_take;
 
-        for (auto l(_imp->take_specs.begin()), l_end(_imp->take_specs.end()) ;
-                l != l_end ; ++l)
+        if (dep.spec().if_package())
         {
-            PackageDepSpec spec(*dep.spec().if_package());
-            if (match_qpns(*_imp->env, *l, *spec.package_ptr()))
-                return si_take;
+            for (auto l(_imp->take_specs.begin()), l_end(_imp->take_specs.end()) ;
+                    l != l_end ; ++l)
+                if (match_qpns(*_imp->env, *l, *dep.spec().if_package()->package_ptr()))
+                    return si_take;
         }
 
         for (auto l(_imp->take_from_specs.begin()), l_end(_imp->take_from_specs.end()) ;
                 l != l_end ; ++l)
         {
-            if (match_qpns(*_imp->env, *l, resolution->resolvent().package()))
+            if (match_package(*_imp->env, *l, *id, { }))
                 return si_take;
         }
 
-        for (auto l(_imp->ignore_specs.begin()), l_end(_imp->ignore_specs.end()) ;
-                l != l_end ; ++l)
+        if (dep.spec().if_package())
         {
-            PackageDepSpec spec(*dep.spec().if_package());
-            if (match_qpns(*_imp->env, *l, *spec.package_ptr()))
-                return si_ignore;
+            for (auto l(_imp->ignore_specs.begin()), l_end(_imp->ignore_specs.end()) ;
+                    l != l_end ; ++l)
+                if (match_qpns(*_imp->env, *l, *dep.spec().if_package()->package_ptr()))
+                    return si_ignore;
         }
 
         for (auto l(_imp->ignore_from_specs.begin()), l_end(_imp->ignore_from_specs.end()) ;
                 l != l_end ; ++l)
         {
-            if (match_qpns(*_imp->env, *l, resolution->resolvent().package()))
+            if (match_package(*_imp->env, *l, *id, { }))
                 return si_ignore;
         }
 
diff --git a/paludis/resolver/interest_in_spec_helper.hh b/paludis/resolver/interest_in_spec_helper.hh
index 636d21f63..34cccaa62 100644
--- a/paludis/resolver/interest_in_spec_helper.hh
+++ b/paludis/resolver/interest_in_spec_helper.hh
@@ -58,6 +58,7 @@ namespace paludis
 
                 SpecInterest operator() (
                         const std::shared_ptr<const Resolution> &,
+                        const std::shared_ptr<const PackageID> &,
                         const SanitisedDependency &) const;
         };
     }
diff --git a/paludis/resolver/resolver_functions.hh b/paludis/resolver/resolver_functions.hh
index ae65454dd..d05280e80 100644
--- a/paludis/resolver/resolver_functions.hh
+++ b/paludis/resolver/resolver_functions.hh
@@ -149,6 +149,7 @@ namespace paludis
 
         typedef std::function<SpecInterest (
                 const std::shared_ptr<const Resolution> &,
+                const std::shared_ptr<const PackageID> &,
                 const SanitisedDependency &
                 )> InterestInSpecFunction;