diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-05 21:50:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-05 21:50:08 +0000 |
| commit | 93a371d22f5c368e6a4ad2bcfca84bfd26ee0bdb (patch) | |
| tree | 63e1549b17db7861a77a731db456414d3da557f6 | |
| parent | c94e1dd32929829dcd8d05a7040ce95d669957bb (diff) | |
| download | portage-93a371d22f5c368e6a4ad2bcfca84bfd26ee0bdb.tar.gz portage-93a371d22f5c368e6a4ad2bcfca84bfd26ee0bdb.tar.bz2 portage-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
| -rwxr-xr-x | bin/misc-functions.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 1d7af4043..59fa51e70 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 |