From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Jun 2006 02:00:00 +0000 (-0000)
Subject: Bug 136236 misc-functions.sh fails to always honor RESTRICT=stricter - Donnie Berkhol... 
X-Git-Tag: v2.1-r1~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e4f02402f972524a0e61db56afbd31df9f29a42;p=portage.git

Bug 136236 misc-functions.sh fails to always honor RESTRICT=stricter - Donnie Berkholz spyderous@gentoo.org (patch from trunk r3481)

svn path=/main/branches/2.1/; revision=3558
---

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 6bdd6d638..abdc7d6e0 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -48,7 +48,7 @@ install_qa_check() {
 		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 @@ install_qa_check() {
 			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}"