aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2012-03-22 15:06:50 (GMT)
committerSebastian Pipping <sebastian@pipping.org>2012-03-22 15:06:50 (GMT)
commit5a7bc18180612f5ada377be3df1ae20596ebfdac (patch)
treea5752f83c2d46c890245257e9fe056b38bc3c5fb
parentBump version to 3.4.26 (diff)
downloadgenkernel-5a7bc18180612f5ada377be3df1ae20596ebfdac.zip
genkernel-5a7bc18180612f5ada377be3df1ae20596ebfdac.tar.gz
genkernel-5a7bc18180612f5ada377be3df1ae20596ebfdac.tar.bz2
Make errors stand out more
-rw-r--r--ChangeLog4
-rwxr-xr-xgen_funcs.sh35
2 files changed, 22 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index aa381b8..b2529bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
# Distributed under the GPL v2
# $Id$
+ 22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh,
+ gen_initramfs.sh:
+ Make errors stand out more
+
22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
Bump version to 3.4.26
diff --git a/gen_funcs.sh b/gen_funcs.sh
index 739311b..f199014 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -204,29 +204,30 @@ gen_die() {
then
print_error 1 "ERROR: ${1}"
fi
- echo
- print_info 1 "-- Grepping log... --"
- echo
+ print_error 1 ''
+ print_error 1 "-- Grepping log... --"
+ print_error 1 ''
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}
+ 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}|"
else
grep -B5 -E "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE}
fi
- 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 ''
+ 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 ''
# Cleanup temp dirs and caches if requested
cleanup