aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-02 23:45:31 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-02 23:45:31 +0100
commitb68aed63f615e1d9c82779009ed28130ca40f480 (patch)
tree94f37daa1a58947d22c0aada4361ca3224101a89
parent7765dfc289cda92b259af400b62b7f0bca4cb6c0 (diff)
downloadpaludis-b68aed63f615e1d9c82779009ed28130ca40f480.tar.gz
paludis-b68aed63f615e1d9c82779009ed28130ca40f480.tar.xz
Remove root before permit_destination
-rw-r--r--paludis/merger.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/paludis/merger.cc b/paludis/merger.cc
index ed7dadf..bec6257 100644
--- a/paludis/merger.cc
+++ b/paludis/merger.cc
@@ -162,7 +162,7 @@ Merger::do_dir_recursive(bool is_check, const FSPath & src, const FSPath & dst)
on_error(is_check, "Attempted to install empty directory '" + stringify(dst) + "'");
}
- if (! _imp->params.permit_destination()(dst))
+ if (! _imp->params.permit_destination()(dst.strip_leading(_imp->params.root().realpath())))
on_error(is_check, "Not allowed to merge '" + stringify(src) + "' to '" + stringify(dst) + "'");
}