aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-04 20:10:34 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-04 20:10:34 +0000
commit99433068401b9c6bf3d01ed84c7671e2681ef29e (patch)
tree4e8c6ddbf40a87142bdab762f69ce5195cd0305a
parentee5b2b0cd380a84d01db55e5b96a0fdf0bce2cb4 (diff)
downloadpaludis-99433068401b9c6bf3d01ed84c7671e2681ef29e.tar.gz
paludis-99433068401b9c6bf3d01ed84c7671e2681ef29e.tar.xz
Call hash -r after merging or unmerging anything
-rw-r--r--ebuild/builtin_merge.bash6
-rw-r--r--ebuild/builtin_unmerge.bash3
2 files changed, 9 insertions, 0 deletions
diff --git a/ebuild/builtin_merge.bash b/ebuild/builtin_merge.bash
index f12f702..09c2c6a 100644
--- a/ebuild/builtin_merge.bash
+++ b/ebuild/builtin_merge.bash
@@ -89,6 +89,9 @@ builtin_merge()
fi
fi
+ echo hash -r
+ hash -r
+
if ! /bin/sh -c 'echo Good, our shell is still usable' ; then
echo "Looks like our shell broke. Trying an ldconfig to fix it..."
ldconfig -r ${ROOT}
@@ -97,6 +100,9 @@ builtin_merge()
if [[ -n "${reinstall}" ]] ; then
${unmerge} "${ROOT%/}/" "${dbdir}/OLDCONTENTS" || die "unmerge failed"
+ echo hash -r
+ hash -r
+
if ! /bin/sh -c 'echo Good, our shell is still usable' ; then
echo "Looks like our shell broke. Trying an ldconfig to fix it..."
ldconfig -r ${ROOT}
diff --git a/ebuild/builtin_unmerge.bash b/ebuild/builtin_unmerge.bash
index 8b106fd..96f0d5f 100644
--- a/ebuild/builtin_unmerge.bash
+++ b/ebuild/builtin_unmerge.bash
@@ -78,6 +78,9 @@ builtin_unmerge()
${unmerge} "${ROOT}/" "${dbdir}/CONTENTS" || die "unmerge failed"
+ echo hash -r
+ hash -r
+
if ! /bin/sh -c 'echo Good, our shell is still usable' ; then
echo "Looks like our shell broke. Trying an ldconfig to fix it..."
ldconfig -r ${ROOT}