aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-05 16:43:35 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-05 16:43:35 +0000
commitbf7e76ce8c51cb787346d5cfbc114c0a3b77a949 (patch)
treefbbe369f4d7a4c3c4f3dd5e5ed764f708d737cc6
parent9103164633f8803adec061e2b8f7ce4735d7ee87 (diff)
downloadpaludis-bf7e76ce8c51cb787346d5cfbc114c0a3b77a949.tar.gz
paludis-bf7e76ce8c51cb787346d5cfbc114c0a3b77a949.tar.xz
Don't display double slashes
-rw-r--r--ebuild/merge.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/ebuild/merge.cc b/ebuild/merge.cc
index 10ae7e8..5574c80 100644
--- a/ebuild/merge.cc
+++ b/ebuild/merge.cc
@@ -113,6 +113,8 @@ namespace
root_str.clear();
if (0 != dst_dir_str.compare(0, root_str.length(), root_str))
throw Failure("do_dir confused: '" + root_str + "' '" + dst_dir_str + "'");
+ if (dst_dir_str == "/")
+ dst_dir_str.clear();
cout << ">>> " << std::setw(5) << std::left << "[dir]" << " " <<
dst_dir_str.substr(root_str.length()) << "/" << dst_dir.basename() << endl;
@@ -173,6 +175,8 @@ namespace
root_str.clear();
if (0 != dst_dir_str.compare(0, root_str.length(), root_str))
throw Failure("do_obj confused: '" + root_str + "' '" + dst_dir_str + "'");
+ if (dst_dir_str == "/")
+ dst_dir_str.clear();
cout << ">>> " << std::setw(5) << std::left << "[obj]" << " " <<
dst_dir_str.substr(root_str.length()) << "/" << dst.basename();
@@ -257,6 +261,8 @@ namespace
root_str.clear();
if (0 != dst_dir_str.compare(0, root_str.length(), root_str))
throw Failure("do_sym confused: '" + root_str + "' '" + dst_dir_str + "'");
+ if (dst_dir_str == "/")
+ dst_dir_str.clear();
cout << ">>> " << std::setw(5) << std::left << "[sym]" << " " <<
dst_dir_str.substr(root_str.length()) << "/" << dst.basename() << endl;