Let merges uninstall things

1 files changed, 1 insertions, 6 deletions

diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index 71320c725..830cba84b 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -58,7 +58,7 @@ using namespace paludis;
 
 namespace
 {
-    void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id)
+    void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
     {
         if (id)
             throw InternalError(PALUDIS_HERE, "cannot uninstall");
@@ -79,10 +79,6 @@ namespace
             return mm->second;
     }
 
-    void dummy_used_this_for_config_protect(const std::string &)
-    {
-    }
-
     WantPhase want_all_phases(const std::string &)
     {
         return wp_yes;
@@ -154,7 +150,6 @@ namespace
                         value_for<n::make_output_manager>(&make_standard_output_manager),
                         value_for<n::perform_uninstall>(&cannot_uninstall),
                         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)
                     ));