summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-05 21:50:08 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-05 21:50:08 +0000
commit93a371d22f5c368e6a4ad2bcfca84bfd26ee0bdb (patch)
tree63e1549b17db7861a77a731db456414d3da557f6 /bin
parentCache results for Task.__hash__() calls. (diff)
downloadportage-multirepo-93a371d22f5c368e6a4ad2bcfca84bfd26ee0bdb.tar.gz
portage-multirepo-93a371d22f5c368e6a4ad2bcfca84bfd26ee0bdb.tar.bz2
portage-multirepo-93a371d22f5c368e6a4ad2bcfca84bfd26ee0bdb.zip
Use find -path -or -name to match basenames of files in INSTALL_MASK
as suggested by solar in bug #219286, comment #8. svn path=/main/trunk/; revision=10212
Diffstat (limited to 'bin')
-rwxr-xr-xbin/misc-functions.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 1d7af404..59fa51e7 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -413,7 +413,8 @@ install_mask() {
rm -Rf "${root}"/${no_inst} >&/dev/null
# we also need to handle globs (*.a, *.h, etc)
- find "${root}" -path "${no_inst}" -exec rm -fR {} \; >/dev/null
+ find "${root}" \( -path "${no_inst}" -or -name "${no_inst}" \) \
+ -exec rm -fR {} \; >/dev/null
done
# set everything back the way we found it
set +o noglob