aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-06-28 21:50:51 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-06-28 21:50:51 +0000
commit8da54ad0a2dcdacf173bdd2cb336474e41ab648f (patch)
tree278446077443299e45f7f4015cafe92cfc4c4325
parent3d9f664cdc0a5d72af12e0dd618f3c9112ad24ab (diff)
downloadpaludis-8da54ad0a2dcdacf173bdd2cb336474e41ab648f.tar.gz
paludis-8da54ad0a2dcdacf173bdd2cb336474e41ab648f.tar.xz
Fix merge to /
-rw-r--r--ebuild/utils/merge.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/ebuild/utils/merge.cc b/ebuild/utils/merge.cc
index a49c87b..fa6be69 100644
--- a/ebuild/utils/merge.cc
+++ b/ebuild/utils/merge.cc
@@ -201,6 +201,8 @@ namespace
+ stringify(src_dir) + "' to '" + stringify(dst_dir) + "':");
std::string root_str(stringify(root)), dst_dir_str(stringify(dst_dir.dirname()));
+ if (root_str == "/")
+ 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 + "'");
@@ -236,6 +238,8 @@ namespace
+ stringify(src) + "' to '" + stringify(dst) + "':");
std::string root_str(stringify(root)), dst_dir_str(stringify(dst.dirname()));
+ if (root_str == "/")
+ 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 + "'");
@@ -315,6 +319,8 @@ namespace
+ stringify(src) + "' to '" + stringify(dst) + "':");
std::string root_str(stringify(root)), dst_dir_str(stringify(dst.dirname()));
+ if (root_str == "/")
+ 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 + "'");