From b68aed63f615e1d9c82779009ed28130ca40f480 Mon Sep 17 00:00:00 2001 From: Ciaran McCreesh Date: Fri, 2 Sep 2011 23:45:31 +0100 Subject: Remove root before permit_destination --- paludis/merger.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paludis/merger.cc b/paludis/merger.cc index ed7dadf90..bec62573d 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) + "'"); } -- cgit v1.2.3