aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-08 18:30:25 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-08 20:33:46 +0000
commitb403744d94299bf5dc4c5a1a7650a76d70d2d72c (patch)
treea97d8179dbfb55ad4ad7df44a5438b9cba81df15 /paludis/repositories
parent26cdad7e7cd655655e06fc07eef74ab01d63250b (diff)
downloadpaludis-b403744d94299bf5dc4c5a1a7650a76d70d2d72c.tar.gz
paludis-b403744d94299bf5dc4c5a1a7650a76d70d2d72c.tar.xz
Pass replacing to merge
Diffstat (limited to 'paludis/repositories')
-rw-r--r--paludis/repositories/accounts/accounts_id.cc1
-rw-r--r--paludis/repositories/e/do_install_action.cc1
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.cc1
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc1
4 files changed, 4 insertions, 0 deletions
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index 73b66ef88..64aa7eebd 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -517,6 +517,7 @@ AccountsID::perform_action(Action & action) const
n::output_manager() = output_manager,
n::package_id() = shared_from_this(),
n::perform_uninstall() = install_action->options.perform_uninstall(),
+ n::replacing() = install_action->options.replacing(),
n::used_this_for_config_protect() = std::bind(
&used_this_for_config_protect, std::ref(used_config_protect), std::placeholders::_1)
));
diff --git a/paludis/repositories/e/do_install_action.cc b/paludis/repositories/e/do_install_action.cc
index ea848f37f..c009a445b 100644
--- a/paludis/repositories/e/do_install_action.cc
+++ b/paludis/repositories/e/do_install_action.cc
@@ -293,6 +293,7 @@ paludis::erepository::do_install_action(
n::output_manager() = output_manager,
n::package_id() = id,
n::perform_uninstall() = install_action.options.perform_uninstall(),
+ n::replacing() = install_action.options.replacing(),
n::used_this_for_config_protect() = std::bind(
&used_this_for_config_protect, std::ref(used_config_protect), std::placeholders::_1)
));
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.cc b/paludis/repositories/unavailable/unavailable_repository_id.cc
index f03463bc0..6019982f0 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_id.cc
@@ -234,6 +234,7 @@ UnavailableRepositoryID::perform_action(Action & action) const
n::output_manager() = output_manager,
n::package_id() = shared_from_this(),
n::perform_uninstall() = install_action->options.perform_uninstall(),
+ n::replacing() = install_action->options.replacing(),
n::used_this_for_config_protect() = std::bind(
&used_this_for_config_protect, std::ref(used_config_protect), std::placeholders::_1)
));
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 56665e5f1..ceedaf10a 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -441,6 +441,7 @@ UnpackagedID::perform_action(Action & action) const
n::output_manager() = output_manager,
n::package_id() = shared_from_this(),
n::perform_uninstall() = install_action->options.perform_uninstall(),
+ n::replacing() = install_action->options.replacing(),
n::used_this_for_config_protect() = std::bind(
&used_this_for_config_protect, std::ref(used_config_protect), std::placeholders::_1)
));