aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-13 13:18:21 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-13 13:39:35 +0100
commit7db9b623aa303e9c16bb113444e9fcceb0e0cddf (patch)
tree4327b350c40371a89e91b4619b15168a7cbfcdbe /paludis
parentd9c24549432889d1ab53d4f2641c9ebd45ec8335 (diff)
downloadpaludis-7db9b623aa303e9c16bb113444e9fcceb0e0cddf.tar.gz
paludis-7db9b623aa303e9c16bb113444e9fcceb0e0cddf.tar.xz
PretendAction needs destination
Diffstat (limited to 'paludis')
-rw-r--r--paludis/action.hh2
-rw-r--r--paludis/legacy/install_task.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_4.cc1
3 files changed, 4 insertions, 0 deletions
diff --git a/paludis/action.hh b/paludis/action.hh
index b8e0237..716fcbf 100644
--- a/paludis/action.hh
+++ b/paludis/action.hh
@@ -363,6 +363,8 @@ namespace paludis
*/
struct PretendActionOptions
{
+ NamedValue<n::destination, std::shared_ptr<Repository> > destination;
+
/**
* This is a function to avoid chicken / egg problems when using
* Environment::create_output_manager.
diff --git a/paludis/legacy/install_task.cc b/paludis/legacy/install_task.cc
index a4d93d2..6749f69 100644
--- a/paludis/legacy/install_task.cc
+++ b/paludis/legacy/install_task.cc
@@ -748,6 +748,7 @@ InstallTask::_pretend()
if (dep->package_id()->supports_action(pretend_action_query))
{
PretendActionOptions options(make_named_values<PretendActionOptions>(
+ n::destination() = dep->destination(),
n::make_output_manager() = std::ref(output_manager_holder)
));
PretendAction pretend_action(options);
diff --git a/paludis/repositories/e/e_repository_TEST_4.cc b/paludis/repositories/e/e_repository_TEST_4.cc
index 5e801a3..ce63a15 100644
--- a/paludis/repositories/e/e_repository_TEST_4.cc
+++ b/paludis/repositories/e/e_repository_TEST_4.cc
@@ -137,6 +137,7 @@ namespace test_cases
));
PretendAction pretend_action(make_named_values<PretendActionOptions>(
+ n::destination() = installed_repo,
n::make_output_manager() = &make_standard_output_manager
));