From: Fabian Groffen Date: Wed, 2 Jan 2008 11:18:26 +0000 (-0000) Subject: Hundreds of die messages suck and completely jungle up the terminal, and actually... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=035a6477dfbf35c4e04b6c47cae9114d950ee92e;p=portage.git Hundreds of die messages suck and completely jungle up the terminal, and actually obstruct the cause, use a file to 'talk' between parent and sub-processes svn path=/main/branches/prefix/; revision=9134 --- diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index bc42f8d19..f1a52e71d 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -336,6 +336,7 @@ install_qa_check() { # Check that we don't get kernel traps at runtime because of broken # install_names on Darwin + rm -f "${T}"/.install_name_check_failed [[ ${CHOST} == *-darwin* ]] && find "${ED}" -type f | while read f ; do otool -LX "${f}" \ | grep -v "Archive : " \ @@ -353,16 +354,19 @@ install_qa_check() { else eqawarn "QA Notice: invalid reference to ${r} in ${f}" # remember we are in an implicit subshell, that's - # why we die here ... ideally we should be able to - # die correctly/nicely here - # secret switch "allow_broken_install_names" to get - # around this and install broken crap (not a good idea) - hasq allow_broken_install_names ${FEATURES} || \ - die "invalid install_name found, ${f} will crash at runtime -- there may be possibly more affected files" + # why we touch a file here ... ideally we should be + # able to die correctly/nicely here + touch "${T}"/.install_name_check_failed fi fi done done + if [[ -f ${T}/.install_name_check_failed ]] ; then + # secret switch "allow_broken_install_names" to get + # around this and install broken crap (not a good idea) + hasq allow_broken_install_names ${FEATURES} || \ + die "invalid install_name found, your application will crash at runtime" + fi # Evaluate misc gcc warnings if [[ -n ${PORTAGE_LOG_FILE} && -r ${PORTAGE_LOG_FILE} ]] ; then