aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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}