aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-08 20:31:43 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-08 20:33:47 +0000
commit55e1dfd80ba17b9e992e5f4687e353f42f67517a (patch)
tree8d3a4d7cc9b8af85f434eb7a2fbfa830fa8ea739
parent1bb75d1a67d4a857a15f4fdb140cabade672214c (diff)
downloadpaludis-55e1dfd80ba17b9e992e5f4687e353f42f67517a.tar.gz
paludis-55e1dfd80ba17b9e992e5f4687e353f42f67517a.tar.xz
Show what we're deleting
-rw-r--r--paludis/repositories/e/e_repository.cc13
1 files changed, 12 insertions, 1 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index ca39d28..0663f57 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()))