aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-17 00:36:39 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-17 00:36:39 +0100
commitefae3504310a988cae6bb4a5a439dc0b4bbe3832 (patch)
tree2b7dd56b85f795637d3207e2f0829c11e457e6f6
parent4c1b9b7ad3d786c1c61c9cdfc25aa4845c3f089f (diff)
downloadpaludis-efae3504310a988cae6bb4a5a439dc0b4bbe3832.tar.gz
paludis-efae3504310a988cae6bb4a5a439dc0b4bbe3832.tar.xz
happy happy joy joy
-rw-r--r--paludis/repositories/e/exndbam_repository.cc8
-rw-r--r--paludis/repositories/e/vdb_repository.cc7
2 files changed, 6 insertions, 9 deletions
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index 5390110..6a99651 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -397,8 +397,6 @@ ExndbamRepository::merge(const MergeParams & m)
{
}
- const std::tr1::shared_ptr<FSEntrySet> merged_entries(new FSEntrySet);
-
NDBAMMerger merger(
make_named_values<NDBAMMergerParams>(
value_for<n::config_protect>(config_protect),
@@ -408,7 +406,7 @@ ExndbamRepository::merge(const MergeParams & m)
value_for<n::get_new_ids_or_minus_one>(std::tr1::bind(&get_new_ids_or_minus_one, _imp->params.environment(), std::tr1::placeholders::_1)),
value_for<n::image>(m.image_dir()),
value_for<n::install_under>(FSEntry("/")),
- value_for<n::merged_entries>(merged_entries),
+ value_for<n::merged_entries>(m.merged_entries()),
value_for<n::options>(m.options()),
value_for<n::output_manager>(m.output_manager()),
value_for<n::package_id>(m.package_id()),
@@ -435,7 +433,7 @@ ExndbamRepository::merge(const MergeParams & m)
UninstallActionOptions uo(make_named_values<UninstallActionOptions>(
value_for<n::config_protect>(config_protect),
value_for<n::if_for_install_id>(m.package_id()),
- value_for<n::ignore_for_unmerge>(std::tr1::bind(&ignore_merged, merged_entries,
+ value_for<n::ignore_for_unmerge>(std::tr1::bind(&ignore_merged, m.merged_entries(),
std::tr1::placeholders::_1)),
value_for<n::is_overwrite>(true),
value_for<n::make_output_manager>(std::tr1::bind(&this_output_manager, m.output_manager(), std::tr1::placeholders::_1))
@@ -456,7 +454,7 @@ ExndbamRepository::merge(const MergeParams & m)
UninstallActionOptions uo(make_named_values<UninstallActionOptions>(
value_for<n::config_protect>(config_protect),
value_for<n::if_for_install_id>(m.package_id()),
- value_for<n::ignore_for_unmerge>(std::tr1::bind(&ignore_merged, merged_entries,
+ value_for<n::ignore_for_unmerge>(std::tr1::bind(&ignore_merged, m.merged_entries(),
std::tr1::placeholders::_1)),
value_for<n::is_overwrite>(false),
value_for<n::make_output_manager>(std::tr1::bind(&this_output_manager, m.output_manager(), std::tr1::placeholders::_1))
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index ca6de71..a3a1b0d 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -914,7 +914,6 @@ VDBRepository::merge(const MergeParams & m)
vdb_dir /= (stringify(m.package_id()->name().package()) + "-" + stringify(m.package_id()->version()));
- const std::tr1::shared_ptr<FSEntrySet> merged_entries(new FSEntrySet);
VDBMerger merger(
make_named_values<VDBMergerParams>(
value_for<n::config_protect>(config_protect),
@@ -922,7 +921,7 @@ VDBRepository::merge(const MergeParams & m)
value_for<n::contents_file>(vdb_dir / "CONTENTS"),
value_for<n::environment>(_imp->params.environment()),
value_for<n::image>(m.image_dir()),
- value_for<n::merged_entries>(merged_entries),
+ value_for<n::merged_entries>(m.merged_entries()),
value_for<n::options>(m.options()),
value_for<n::output_manager>(m.output_manager()),
value_for<n::package_id>(m.package_id()),
@@ -981,7 +980,7 @@ VDBRepository::merge(const MergeParams & m)
UninstallActionOptions uo(make_named_values<UninstallActionOptions>(
value_for<n::config_protect>(config_protect),
value_for<n::if_for_install_id>(m.package_id()),
- value_for<n::ignore_for_unmerge>(std::tr1::bind(&ignore_merged, merged_entries,
+ value_for<n::ignore_for_unmerge>(std::tr1::bind(&ignore_merged, m.merged_entries(),
std::tr1::placeholders::_1)),
value_for<n::is_overwrite>(true),
value_for<n::make_output_manager>(std::tr1::bind(&this_output_manager, m.output_manager(), std::tr1::placeholders::_1))
@@ -1002,7 +1001,7 @@ VDBRepository::merge(const MergeParams & m)
UninstallActionOptions uo(make_named_values<UninstallActionOptions>(
value_for<n::config_protect>(config_protect),
value_for<n::if_for_install_id>(m.package_id()),
- value_for<n::ignore_for_unmerge>(std::tr1::bind(&ignore_merged, merged_entries,
+ value_for<n::ignore_for_unmerge>(std::tr1::bind(&ignore_merged, m.merged_entries(),
std::tr1::placeholders::_1)),
value_for<n::is_overwrite>(false),
value_for<n::make_output_manager>(std::tr1::bind(&this_output_manager, m.output_manager(), std::tr1::placeholders::_1))