[gentoo-commits] proj/genkernel:ryao commit in: /

["Richard Yao" <ryao@gentoo.org>]

commit:     9d8ecf17fdab02852b831be6e5f613be88ad36a4
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sun Jun  9 08:13:08 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> 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