aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-15 20:26:33 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-15 20:26:33 +0000
commitbb107c237cc9317b4abea8e6ccfae45f8cc29b8b (patch)
tree51f9c5845594c565655ccf84346bc1f492a32233
parentd5ba8eda5625e71f5252b6da79668ccf8569de43 (diff)
downloadpaludis-bb107c237cc9317b4abea8e6ccfae45f8cc29b8b.tar.gz
paludis-bb107c237cc9317b4abea8e6ccfae45f8cc29b8b.tar.xz
Fix merge to /
-rwxr-xr-xebuild/utils/merge4
1 files changed, 2 insertions, 2 deletions
diff --git a/ebuild/utils/merge b/ebuild/utils/merge
index a79fce9..2c478e3 100755
--- a/ebuild/utils/merge
+++ b/ebuild/utils/merge
@@ -27,10 +27,10 @@ fi
shopt -s dotglob
shopt -s nullglob
-src=$(readlink -f "${1%/}" )
+src=$(readlink -f "${1%/}/" )
src="${src//+(\/)/\/}"
export top_src="${src}"
-dst=$(readlink -f "${2%/}" )
+dst=$(readlink -f "${2%/}/" )
dst="${dst//+(\/)/\/}"
export top_dst="${dst}"
export contents=${3}