[patch] fix INSTALL_MASK

install_mask.patch (text/plain), 1.33 KB, created by Zac Medico on 2008-05-05 21:57:02 UTC

Index: bin/misc-functions.sh
===================================================================
--- bin/misc-functions.sh	(revision 10196)
+++ bin/misc-functions.sh	(revision 10213)
@@ -377,7 +377,8 @@
 		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
Index: pym/portage.py
===================================================================
--- pym/portage.py	(revision 10196)
+++ pym/portage.py	(revision 10197)
@@ -1098,7 +1098,12 @@
 		"XARGS",
 	]
 
+	# user config variables
 	_environ_whitelist += [
+		"DOC_SYMLINKS_DIR", "INSTALL_MASK", "PKG_INSTALL_MASK"
+	]
+
+	_environ_whitelist += [
 		"A", "AA", "CATEGORY", "P", "PF", "PN", "PR", "PV", "PVR"
 	]
 
Index: bin/isolated-functions.sh
===================================================================
--- bin/isolated-functions.sh	(revision 10196)
+++ bin/isolated-functions.sh	(revision 10197)
@@ -485,6 +485,9 @@
 			ROOT ROOTPATH RPMDIR STARTDIR TMP TMPDIR USE_EXPAND \
 			WARN XARGS _RC_GET_KV_CACHE
 
+		# user config variables
+		unset DOC_SYMLINKS_DIR INSTALL_MASK PKG_INSTALL_MASK
+
 		set
 		export
 	)