diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-06-21 02:00:00 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-06-21 02:00:00 +0000 |
commit | 8e4f02402f972524a0e61db56afbd31df9f29a42 (patch) | |
tree | dd70c6cb1999a51f9584a2cd6ca944a6f0c52458 | |
parent | 463387f0504fd0477bfe7ac9d2687b0a95320e3d (diff) | |
download | portage-8e4f02402f972524a0e61db56afbd31df9f29a42.tar.gz portage-8e4f02402f972524a0e61db56afbd31df9f29a42.tar.bz2 portage-8e4f02402f972524a0e61db56afbd31df9f29a42.zip |
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
-rwxr-xr-x | bin/misc-functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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}" |