From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A69981381F3 for ; Sun, 9 Jun 2013 08:16:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4414BE084C; Sun, 9 Jun 2013 08:16:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7576E084C for ; Sun, 9 Jun 2013 08:16:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A75A433E33F for ; Sun, 9 Jun 2013 08:16:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 47A04E468F for ; Sun, 9 Jun 2013 08:16:02 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1370765692.9d8ecf17fdab02852b831be6e5f613be88ad36a4.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:ryao commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_funcs.sh X-VCS-Directories: / X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 9d8ecf17fdab02852b831be6e5f613be88ad36a4 X-VCS-Branch: ryao Date: Sun, 9 Jun 2013 08:16:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5774bdbd-314f-4288-89cb-66fe183b044f X-Archives-Hash: 71b6920c0c9bd091202f5643baa14a7c commit: 9d8ecf17fdab02852b831be6e5f613be88ad36a4 Author: Richard Yao cs stonybrook edu> AuthorDate: Sun Jun 9 08:13:08 2013 +0000 Commit: Richard Yao gentoo org> CommitDate: Sun Jun 9 08:14:52 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9d8ecf17 Revert "Make errors stand out more" Having the debug shell appear whenever an error occurred was incredibly useful. Commit 5a7bc18180612f5ada377be3df1ae20596ebfdac broke that, so we revert it. --- gen_funcs.sh | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gen_funcs.sh b/gen_funcs.sh index 4f0a0fc..2d47976 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -204,30 +204,29 @@ gen_die() { then print_error 1 "ERROR: ${1}" fi - print_error 1 '' - print_error 1 "-- Grepping log... --" - print_error 1 '' + echo + print_info 1 "-- Grepping log... --" + echo if isTrue ${USECOLOR} then - GREP_COLOR='1' grep -B5 -E --colour=always "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE} \ - | sed -s "s|^\(*\)\?|${BAD}*${NORMAL}|" + GREP_COLOR='1' grep -B5 -E --colour=always "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE} else grep -B5 -E "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE} fi - print_error 1 '' - print_error 1 "-- End log... --" - print_error 1 '' - print_error 1 "Please consult ${LOGFILE} for more information and any" - print_error 1 "errors that were reported above." - print_error 1 '' - print_error 1 "Report any genkernel bugs to bugs.gentoo.org and" - print_error 1 "assign your bug to genkernel@gentoo.org. Please include" - print_error 1 "as much information as you can in your bug report; attaching" - print_error 1 "${LOGFILE} so that your issue can be dealt with effectively." - print_error 1 '' - print_error 1 'Please do *not* report compilation failures as genkernel bugs!' - print_error 1 '' + echo + print_info 1 "-- End log... --" + echo + print_info 1 "Please consult ${LOGFILE} for more information and any" + print_info 1 "errors that were reported above." + echo + print_info 1 "Report any genkernel bugs to bugs.gentoo.org and" + print_info 1 "assign your bug to genkernel@gentoo.org. Please include" + print_info 1 "as much information as you can in your bug report; attaching" + print_info 1 "${LOGFILE} so that your issue can be dealt with effectively." + print_info 1 '' + print_info 1 'Please do *not* report compilation failures as genkernel bugs!' + print_info 1 '' # Cleanup temp dirs and caches if requested cleanup