From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 31 Jan 2008 23:48:20 +0000 (-0000)
Subject: Bug #205718 - Fix quoting of ${INSTALL_MASK} where appropriate. Thanks
X-Git-Tag: v2.1.4.1~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f822ad10103f92a8869b624e10e16cbdb103dd1;p=portage.git

Bug #205718 - Fix quoting of ${INSTALL_MASK} where appropriate. Thanks
to Ed Catmur <ed@catmur.co.uk> for this patch. (trunk r9256)

svn path=/main/branches/2.1.2/; revision=9257
---

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index f41ebad5a..17e51056c 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -377,7 +377,7 @@ 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}" -exec rm -fR {} \; >/dev/null
 	done
 	# set everything back the way we found it
 	set +o noglob
@@ -414,7 +414,7 @@ preinst_mask() {
 		fi
 	done
 
-	install_mask "${D}" ${INSTALL_MASK}
+	install_mask "${D}" "${INSTALL_MASK}"
 
 	# remove share dir if unnessesary
 	if hasq nodoc $FEATURES -o hasq noman $FEATURES -o hasq noinfo $FEATURES; then
@@ -525,7 +525,7 @@ preinst_selinux_labels() {
 
 dyn_package() {
 	cd "${PORTAGE_BUILDDIR}/image"
-	install_mask "${PORTAGE_BUILDDIR}/image" ${PKG_INSTALL_MASK}
+	install_mask "${PORTAGE_BUILDDIR}/image" "${PKG_INSTALL_MASK}"
 	local pkg_dest="${PKGDIR}/All/${PF}.tbz2"
 	local pkg_tmp="${PKGDIR}/All/${PF}.tbz2.$$"
 	local tar_options=""