summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2006-06-10 00:25:42 +0000
committerNed Ludd <solar@gentoo.org>2006-06-10 00:25:42 +0000
commit175050ec186316d861112279c09062e671db4b9c (patch)
tree223f4c973abd6e5bb230ac66e86a747c698797f5
parenta557ecd1b9d964f4b3fcd3a0fa107e41f2a77f1c (diff)
downloadportage-175050ec186316d861112279c09062e671db4b9c.tar.gz
portage-175050ec186316d861112279c09062e671db4b9c.tar.bz2
portage-175050ec186316d861112279c09062e671db4b9c.zip
- Bug 136236 misc-functions.sh fails to always honor RESTRICT=stricter - Donnie Berkholz spyderous@gentoo.org
svn path=/main/trunk/; revision=3481
-rwxr-xr-xbin/misc-functions.sh4
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}"