aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/exndbam_repository.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-27 23:54:51 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-01 03:57:52 +0000
commit97c38fc7c02260a2d213d9a16d878a0410b9d57a (patch)
treefef7c8137e22b2582acb3b66496ced9aa4135897 /paludis/repositories/e/exndbam_repository.cc
parenta1b11d059009182f19bf9cf23e060dee752d4632 (diff)
downloadpaludis-97c38fc7c02260a2d213d9a16d878a0410b9d57a.tar.gz
paludis-97c38fc7c02260a2d213d9a16d878a0410b9d57a.tar.xz
Pass PackageIDs by shared_ptr
Diffstat (limited to 'paludis/repositories/e/exndbam_repository.cc')
-rw-r--r--paludis/repositories/e/exndbam_repository.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index 12b805b43..3cf7194e5 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -335,7 +335,7 @@ ExndbamRepository::merge(const MergeParams & m)
Context context("When merging '" + stringify(*m.package_id()) + "' at '" + stringify(m.image_dir())
+ "' to Exndbam repository '" + stringify(name()) + "':");
- if (! is_suitable_destination_for(*m.package_id()))
+ if (! is_suitable_destination_for(m.package_id()))
throw ActionFailedError("Not a suitable destination for '" + stringify(*m.package_id()) + "'");
std::shared_ptr<const PackageID> if_overwritten_id, if_same_name_id;
@@ -506,7 +506,7 @@ ExndbamRepository::perform_uninstall(
for (EAPIPhases::ConstIterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
phase != phase_end ; ++phase)
{
- if (can_skip_phase(id, *phase))
+ if (can_skip_phase(_imp->params.environment(), id, *phase))
{
output_manager->stdout_stream() << "--- No need to do anything for " <<
phase->equal_option("skipname") << " phase" << std::endl;