summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-12-03 19:17:06 +0000
committerMike Frysinger <vapier@gentoo.org>2006-12-03 19:17:06 +0000
commit8e24d26625f3ecd5ecef6ad82e81dbb75114a456 (patch)
tree62eab20c6551abe92af53d0a88ef1db3244969f3
parent5cbe5e5b8197079a276313cbfbbd7cad42e27724 (diff)
downloadportage-8e24d26625f3ecd5ecef6ad82e81dbb75114a456.tar.gz
portage-8e24d26625f3ecd5ecef6ad82e81dbb75114a456.tar.bz2
portage-8e24d26625f3ecd5ecef6ad82e81dbb75114a456.zip
drop RESTRICT=stricter since every aspect it covers can be handled properly via other means
svn path=/main/trunk/; revision=5164
-rwxr-xr-xbin/misc-functions.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index bbfab8456..b0c7e571f 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -47,7 +47,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} && ! has stricter ${RESTRICT}; then
+ if has stricter ${FEATURES} ; then
unset PORTAGE_QUIET
fi
@@ -63,7 +63,7 @@ install_qa_check() {
vecho " with the maintaining herd of the package."
vecho "${f}"
vecho -ne '\a\n'
- if has stricter ${FEATURES} && ! has stricter ${RESTRICT}; then
+ if has stricter ${FEATURES} ; then
insecure_rpath=1
else
vecho "Auto fixing rpaths for ${f}"
@@ -161,7 +161,7 @@ install_qa_check() {
if [[ ${insecure_rpath} -eq 1 ]] ; then
die "Aborting due to serious QA concerns with RUNPATH/RPATH"
- elif [[ -n ${die_msg} ]] && has stricter ${FEATURES} && ! has stricter ${RESTRICT} ; then
+ elif [[ -n ${die_msg} ]] && has stricter ${FEATURES} ; then
die "Aborting due to QA concerns: ${die_msg}"
fi