aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Danny van Dyk <dvandyk@exherbo.org> 2006-05-07 18:26:39 +0000
committerAvatar Danny van Dyk <dvandyk@exherbo.org> 2006-05-07 18:26:39 +0000
commit0fb6b25572ba11a4c394dc0165027b39574abd65 (patch)
treefaac706a4f55f66a1350e0356ca57b7624b72e1f
parent191fb4503ac89a0feace1dd99ff0a09461f16bc3 (diff)
downloadpaludis-0fb6b25572ba11a4c394dc0165027b39574abd65.tar.gz
paludis-0fb6b25572ba11a4c394dc0165027b39574abd65.tar.xz
Adding 'hash -r' to merge fixes Berlios#7414.
-rwxr-xr-xebuild/utils/merge1
1 files changed, 1 insertions, 0 deletions
diff --git a/ebuild/utils/merge b/ebuild/utils/merge
index 11cd907..59abb67 100755
--- a/ebuild/utils/merge
+++ b/ebuild/utils/merge
@@ -99,6 +99,7 @@ merge_this()
echo -n "$(stat -c '%Y' -- ${2}/${ff} )" >> ${contents}
echo >> ${contents}
fi
+ hash -r
elif [[ -d ${f} ]] ; then
local ok=
if [[ -d "${2}/${ff}"/ ]] ; then