From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 5 May 2008 21:50:58 +0000 (-0000)
Subject: Use find -path -or -name to match basenames of files in INSTALL_MASK
X-Git-Tag: v2.1.5~49
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb05db87381f30b5de103548983f61ac154f9f3a;p=portage.git

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
---

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