From 2c1c357c82cc4cc3d2e57252532502f60667930b Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 3 Nov 2007 19:26:31 +0000 Subject: [PATCH] Due to the implicit subshell caused by the pipe abort wasn't ever set, even though it should have. Now we die early, with help of die() being able to die in this case. svn path=/main/branches/prefix/; revision=8399 --- bin/misc-functions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index ac50ed89f..38b5c2734 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -229,7 +229,7 @@ install_qa_check() { # .sos. In addition the version component is before the # extension, not after it. Check for this, and *only* warn # about it. Some packages do ship .so files on Darwin and make - # it work (ugly! e.g. python does this by default). + # it work (ugly!). f="" find ${ED%/} -name "*.so" -or -name "*.so.*" | \ while read i ; do @@ -336,7 +336,6 @@ install_qa_check() { # Check that we don't get kernel traps at runtime because of broken # install_names on Darwin - abort="no" [[ ${CHOST} == *-darwin* ]] && find "${ED}" -type f | while read f ; do otool -LX "${f}" \ | grep -v "Archive : " \ @@ -353,12 +352,13 @@ install_qa_check() { "${r}" "${s}" "${f}" else eqawarn "QA Notice: invalid reference to ${r} in ${f}" - abort="yes" + # remember we are in an implicit subshell, that's + # why we die here + die "invalid install_name found, ${f} will crash at runtime -- there may be possibly more affected files" fi fi done done - [[ ${abort} == "yes" ]] && die "invalid install_names found, objects will crash at runtime" # Evaluate misc gcc warnings if [[ -n ${PORTAGE_LOG_FILE} && -r ${PORTAGE_LOG_FILE} ]] ; then -- 2.26.2