aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Stephen P. Bennett <spb@exherbo.org> 2006-06-30 15:22:01 +0000
committerAvatar Stephen P. Bennett <spb@exherbo.org> 2006-06-30 15:22:01 +0000
commitb4acccebd42be71af423ca36f8b99699bd7142f5 (patch)
tree42a3d0157b625f03bebb940a1d7ecffaf3e91df6
parent57a036499cec0d510f5ffda0121b0ffc3441637e (diff)
downloadpaludis-b4acccebd42be71af423ca36f8b99699bd7142f5.tar.gz
paludis-b4acccebd42be71af423ca36f8b99699bd7142f5.tar.xz
Better symlink handling in merge
-rw-r--r--ebuild/utils/merge.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ebuild/utils/merge.cc b/ebuild/utils/merge.cc
index 7345555..abcd966 100644
--- a/ebuild/utils/merge.cc
+++ b/ebuild/utils/merge.cc
@@ -369,7 +369,7 @@ namespace
else if (d->is_directory())
{
do_dir(root, src_dir / d->basename(), dst_dir / d->basename(), contents);
- merge_this(root, src_dir / d->basename(), dst_dir / d->basename(), contents);
+ merge_this(root, (src_dir / d->basename()).realpath(), (dst_dir / d->basename()).realpath(), contents);
}
else
throw Failure("Don't know how to merge '" + stringify(*d) + "'");