aboutsummaryrefslogtreecommitdiff
path: root/paludis/legacy/install_task.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-28 22:19:20 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-01 03:57:52 +0000
commit92f0a95d1854442e744f707eaae9add7fd92ff67 (patch)
tree9d403328a07f89c1598b4d3cb0079b292d82729e /paludis/legacy/install_task.cc
parent092228a814cd6700b97112b5dcf931c80b6b9431 (diff)
downloadpaludis-92f0a95d1854442e744f707eaae9add7fd92ff67.tar.gz
paludis-92f0a95d1854442e744f707eaae9add7fd92ff67.tar.xz
Pass env, id to ConditionalDepSpec members
Diffstat (limited to 'paludis/legacy/install_task.cc')
-rw-r--r--paludis/legacy/install_task.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/paludis/legacy/install_task.cc b/paludis/legacy/install_task.cc
index 2b3b2f5c3..9476bc366 100644
--- a/paludis/legacy/install_task.cc
+++ b/paludis/legacy/install_task.cc
@@ -1510,12 +1510,12 @@ namespace
struct CheckSatisfiedVisitor
{
const Environment * const env;
- const PackageID & id;
+ const std::shared_ptr<const PackageID> & id;
std::shared_ptr<const PackageDepSpec> failure;
std::set<SetName> recursing_sets;
CheckSatisfiedVisitor(const Environment * const e,
- const PackageID & i) :
+ const std::shared_ptr<const PackageID> & i) :
env(e),
id(i)
{
@@ -1545,7 +1545,7 @@ namespace
void visit(const DependencySpecTree::NodeType<ConditionalDepSpec>::Type & node)
{
- if (node.spec()->condition_met())
+ if (node.spec()->condition_met(env, id))
std::for_each(indirect_iterator(node.begin()), indirect_iterator(node.end()),
accept_visitor(*this));
}
@@ -1596,7 +1596,7 @@ InstallTask::_unsatisfied(const DepListEntry & e) const
{
Context context("When checking whether dependencies for '" + stringify(*e.package_id()) + "' are satisfied:");
- CheckSatisfiedVisitor v(environment(), *e.package_id());
+ CheckSatisfiedVisitor v(environment(), e.package_id());
if (dl_deps_pre == _imp->dep_list.options()->uninstalled_deps_pre() ||
dl_deps_pre_or_post == _imp->dep_list.options()->uninstalled_deps_pre())
@@ -1786,7 +1786,7 @@ namespace
void visit(const DependencySpecTree::NodeType<ConditionalDepSpec>::Type & node)
{
- if (node.spec()->condition_met())
+ if (node.spec()->condition_met(env, id))
std::for_each(indirect_iterator(node.begin()), indirect_iterator(node.end()),
accept_visitor(*this));
}