diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-05 21:50:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-05 21:50:58 +0000 |
| commit | bb05db87381f30b5de103548983f61ac154f9f3a (patch) | |
| tree | f05e1f746c393c5dc4d9f14e67250a725239847d /bin | |
| parent | 3ed091443c53bff42ec1b8c9b5a1b8fa8b9a3e71 (diff) | |
| download | portage-bb05db87381f30b5de103548983f61ac154f9f3a.tar.gz portage-bb05db87381f30b5de103548983f61ac154f9f3a.tar.bz2 portage-bb05db87381f30b5de103548983f61ac154f9f3a.zip | |
Use find -path -or -name to match basenames of files in INSTALL_MASK
as suggested by solar in bug #219286, comment #8. (trunk r10212)
svn path=/main/branches/2.1.2/; revision=10213
Diffstat (limited to 'bin')
| -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 e8ab7b05c..ae27268cf 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -377,7 +377,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 |