Bug 136236 misc-functions.sh fails to always honor RESTRICT=stricter - Donnie Berkhol...

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

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 6bdd6d6382773da672d639e33c5d5984af89033e..abdc7d6e00a44603890085d3c934394b341e97ed 100755 (executable)
--- 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}"