Add 'replacing' to install action options

9 files changed, 31 insertions, 0 deletions

diff --git a/paludis/action.hh b/paludis/action.hh
index fd1f436a2..14b6a5f52 100644
--- a/paludis/action.hh
+++ b/paludis/action.hh
@@ -55,6 +55,7 @@ namespace paludis
         struct failed_integrity_checks;
         struct fetch_unneeded;
         struct make_output_manager;
+        struct replacing;
         struct requires_manual_fetching;
         struct safe_resume;
         struct target_file;
@@ -110,6 +111,13 @@ namespace paludis
         NamedValue<n::make_output_manager, std::tr1::function<std::tr1::shared_ptr<OutputManager> (
                 const InstallAction &)> > make_output_manager;
 
+        /**
+         * We must replace these.
+         *
+         * \since 0.36
+         */
+        NamedValue<n::replacing, std::tr1::shared_ptr<const PackageIDSequence> > replacing;
+
         NamedValue<n::used_this_for_config_protect, std::tr1::function<void (const std::string &)> > used_this_for_config_protect;
         NamedValue<n::want_phase, std::tr1::function<WantPhase (const std::string &)> > want_phase;
     };
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index bd4814082..e424eba13 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -780,9 +780,12 @@ InstallTask::_one(const DepList::Iterator dep, const int x, const int y, const i
         {
             output_manager_holder.reset(new OutputManagerFromEnvironment(_imp->env, dep->package_id(), oe_exclusive));
 
+            std::tr1::shared_ptr<PackageIDSequence> replacing(new PackageIDSequence);
+
             InstallActionOptions install_options(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(dep->destination()),
                         value_for<n::make_output_manager>(std::tr1::ref(*output_manager_holder)),
+                        value_for<n::replacing>(replacing),
                         value_for<n::used_this_for_config_protect>(std::tr1::bind(
                                 &Implementation<InstallTask>::assign_config_protect,
                                 _imp.get(), std::tr1::placeholders::_1)),
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 2c152c542..64c265ea5 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -1106,6 +1106,7 @@ namespace test_cases
             InstallAction action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(installed_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
@@ -1362,6 +1363,7 @@ namespace test_cases
             InstallAction action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(installed_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
@@ -1457,6 +1459,7 @@ namespace test_cases
             InstallAction action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(installed_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
@@ -1582,6 +1585,7 @@ namespace test_cases
             InstallAction action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(installed_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                         ));
@@ -1788,6 +1792,7 @@ namespace test_cases
             InstallAction action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(installed_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
@@ -2371,6 +2376,7 @@ namespace test_cases
             InstallAction action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(installed_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index 8dccca831..a7c6e4692 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -146,6 +146,7 @@ namespace
             InstallAction action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(installed_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
diff --git a/paludis/repositories/e/e_repository_TEST_exlibs.cc b/paludis/repositories/e/e_repository_TEST_exlibs.cc
index 19e539609..8209c98e5 100644
--- a/paludis/repositories/e/e_repository_TEST_exlibs.cc
+++ b/paludis/repositories/e/e_repository_TEST_exlibs.cc
@@ -136,6 +136,7 @@ namespace
             InstallAction action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(installed_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
diff --git a/paludis/repositories/e/exndbam_repository_TEST.cc b/paludis/repositories/e/exndbam_repository_TEST.cc
index 71c81dd19..0f8cae9a2 100644
--- a/paludis/repositories/e/exndbam_repository_TEST.cc
+++ b/paludis/repositories/e/exndbam_repository_TEST.cc
@@ -130,6 +130,7 @@ namespace test_cases
             InstallAction install_action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(exndbam_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 3bbec0082..f2d716074 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -344,6 +344,7 @@ namespace test_cases
             InstallAction install_action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(vdb_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
@@ -470,6 +471,7 @@ namespace test_cases
             InstallAction install_action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(vdb_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
@@ -596,6 +598,7 @@ namespace test_cases
             InstallAction install_action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(vdb_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
@@ -994,6 +997,7 @@ namespace test_cases
             InstallAction install_action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(vdb_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
@@ -1233,6 +1237,7 @@ namespace test_cases
             InstallAction install_action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(vdb_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
@@ -1325,6 +1330,7 @@ namespace test_cases
             InstallAction install_action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(vdb_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
diff --git a/paludis/repositories/unpackaged/installed_repository_TEST.cc b/paludis/repositories/unpackaged/installed_repository_TEST.cc
index fdec71a6d..2c3313219 100644
--- a/paludis/repositories/unpackaged/installed_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/installed_repository_TEST.cc
@@ -397,6 +397,7 @@ namespace test_cases
                 InstallAction action(make_named_values<InstallActionOptions>(
                             value_for<n::destination>(repo),
                             value_for<n::make_output_manager>(&make_standard_output_manager),
+                            value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                             value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                             value_for<n::want_phase>(&want_all_phases)
                         ));
@@ -453,6 +454,7 @@ namespace test_cases
                 InstallAction action(make_named_values<InstallActionOptions>(
                             value_for<n::destination>(repo),
                             value_for<n::make_output_manager>(&make_standard_output_manager),
+                            value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                             value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                             value_for<n::want_phase>(&want_all_phases)
                         ));
@@ -512,6 +514,7 @@ namespace test_cases
                 InstallAction action(make_named_values<InstallActionOptions>(
                             value_for<n::destination>(repo),
                             value_for<n::make_output_manager>(&make_standard_output_manager),
+                            value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                             value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                             value_for<n::want_phase>(&want_all_phases)
                         ));
diff --git a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
index c5c02cd3a..6e8e5eec5 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
@@ -237,6 +237,7 @@ namespace test_cases
             InstallAction action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(installed_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));
@@ -292,6 +293,7 @@ namespace test_cases
             InstallAction action(make_named_values<InstallActionOptions>(
                         value_for<n::destination>(installed_repo),
                         value_for<n::make_output_manager>(&make_standard_output_manager),
+                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
                         value_for<n::used_this_for_config_protect>(&dummy_used_this_for_config_protect),
                         value_for<n::want_phase>(&want_all_phases)
                     ));