From 55e1dfd80ba17b9e992e5f4687e353f42f67517a Mon Sep 17 00:00:00 2001 From: Ciaran McCreesh Date: Wed, 8 Dec 2010 20:31:43 +0000 Subject: Show what we're deleting --- paludis/repositories/e/e_repository.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc index ca39d28f3..0663f570b 100644 --- a/paludis/repositories/e/e_repository.cc +++ b/paludis/repositories/e/e_repository.cc @@ -1949,7 +1949,12 @@ ERepository::merge(const MergeParams & m) { /* 0.1 replacing 00.1 etc */ if (is_replace->fs_location_key()->value() != binary_ebuild_location) - FSPath(is_replace->fs_location_key()->value()).unlink(); + { + FSPath p(is_replace->fs_location_key()->value()); + m.output_manager()->stdout_stream() << "Deleting replaced pbin " << p << std::endl; + p.unlink(); + } + replaces.push_back(is_replace); } @@ -1965,7 +1970,10 @@ ERepository::merge(const MergeParams & m) FSPath p((*r)->fs_location_key()->value()); FSStat p_stat(p); if (p_stat.exists()) + { + m.output_manager()->stdout_stream() << "Deleting pbin " << p << std::endl; p.unlink(); + } replaces.push_back(*r); } @@ -1983,7 +1991,10 @@ ERepository::merge(const MergeParams & m) cache /= (stringify((*r)->name().package()) + "-" + stringify((*r)->version())); if (cache.stat().is_regular_file_or_symlink_to_regular_file()) + { + m.output_manager()->stdout_stream() << "Deleting cache file " << cache << std::endl; cache.unlink(); + } } if (! has_category_named(m.package_id()->name().category())) -- cgit v1.2.3