aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-06 14:20:20 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-07 11:32:56 +0000
commit069c40621c0f9612b689448993f113d5f7ec96dd (patch)
tree1687f78c36a3fea39f60de7be42e0d7dda7be09c /src
parent81ef7b0468950cade215c889d47143db21720695 (diff)
downloadpaludis-069c40621c0f9612b689448993f113d5f7ec96dd.tar.gz
paludis-069c40621c0f9612b689448993f113d5f7ec96dd.tar.xz
Pass ID to additional reqs
Diffstat (limited to 'src')
-rwxr-xr-xsrc/clients/cave/cmd_display_resolution.cc2
-rw-r--r--src/output/console_install_task.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index b5aebc52b..310323872 100755
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -1424,7 +1424,7 @@ namespace
a_end((*c)->spec().if_package()->additional_requirements_ptr()->end()) ;
a != a_end ; ++a)
{
- const std::pair<bool, std::string> p((*a)->requirement_met(env.get(), 0, u->package_id(), 0));
+ const std::pair<bool, std::string> p((*a)->requirement_met(env.get(), 0, u->package_id(), (*c)->from_id(), 0));
if (p.first)
continue;
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index f6d922aa8..d64030f60 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -1755,7 +1755,7 @@ ConsoleInstallTask::on_additional_requirements_not_met_error(const AdditionalReq
i_end(e.query().additional_requirements_ptr()->end()) ;
i != i_end ; ++i)
{
- const std::pair<bool, std::string> r((*i)->requirement_met(environment(), 0, e.package_id(), 0));
+ const std::pair<bool, std::string> r((*i)->requirement_met(environment(), 0, e.package_id(), e.from_package_id(), 0));
if (r.first)
continue;
output_stream() << " * " << r.second << endl;