[patch] portage-honor-restrict-stricter.patch

portage-honor-restrict-stricter.patch (text/plain), 1.04 KB, created by Donnie Berkholz (RETIRED) on 2006-06-09 17:24:20 UTC

RESTRICT=stricter is a valid setting and is honored elsewhere in
misc-functions.sh, but these two locations fail to honor it. One of these two is
a major bug, because it results in failure to fix RPATHs in packages with
RESTRICT=stricter; instead, portage wrongly dies.

-Donnie Berkholz <[e-mail]> 9 Jun 2006

--- /usr/lib/portage/bin/misc-functions.sh.orig	2006-06-09 16:13:53.000000000 -0700
+++ /usr/lib/portage/bin/misc-functions.sh	2006-06-09 16:14:17.000000000 -0700
@@ -48,7 +48,7 @@
 		local qa_var insecure_rpath=0 tmp_quiet=${PORTAGE_QUIET}
 		
 		# display warnings when using stricter because we die afterwards
-		if has stricter ${FEATURES}; then
+		if has stricter ${FEATURES} && ! has stricter ${RESTRICT}; then
 			unset PORTAGE_QUIET
 		fi
 		
@@ -65,7 +65,7 @@
 			vecho " Summary: $CATEGORY/$PN: insecure RPATH ${f}"
 			vecho "${f}"
 			vecho -ne '\a\n'
-			if has stricter ${FEATURES}; then
+			if has stricter ${FEATURES} && ! has stricter ${RESTRICT}; then
 				insecure_rpath=1
 			else
 				vecho "Auto fixing rpaths for ${f}"