From c6619d5f912fb428cfd9784148aa0729bef91d02 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 8 Feb 2007 00:08:29 +0000 Subject: [PATCH] Added patch from Martin Parm to fix the --no-color option. This resolves bug #114156. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@480 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 5 +++++ gen_cmdline.sh | 10 ++++++---- gen_funcs.sh | 3 +++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b521e29..e855a98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 08 Feb 2007; Chris Gianelloni gen_cmdline.sh, + gen_funcs.sh: + Added patch from Martin Parm to fix the --no-color option. + This resolves bug #114156. + 15 Jan 2007; Chris Gianelloni gen_bootloader.sh: Changed basename to dirname when creating the directory from grub.conf to solve bug #161716. diff --git a/gen_cmdline.sh b/gen_cmdline.sh index bd61f6f..2561890 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -417,12 +417,14 @@ parse_cmdline() { print_info 2 "CMD_ARCHOVERRIDE: $CMD_ARCHOVERRIDE" ;; --color) - CMD_USECOLOR=1 - print_info 2 "CMD_USECOLOR: $CMD_USECOLOR" + USECOLOR=1 + print_info 2 "USECOLOR: $USECOLOR" + setColorVars ;; --no-color) - CMD_USECOLOR=0 - print_info 2 "CMD_USECOLOR: $CMD_USECOLOR" + USECOLOR=0 + print_info 2 "USECOLOR: $USECOLOR" + setColorVars ;; --debugfile=*) CMD_DEBUGFILE=`parse_opt "$*"` diff --git a/gen_funcs.sh b/gen_funcs.sh index d419e0d..e0245ab 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -21,6 +21,7 @@ isTrue() { return 1 } +setColorVars() { if isTrue ${USECOLOR} then GOOD=$'\e[32;01m' @@ -37,6 +38,8 @@ else BOLD='' UNDER='' fi +} +setColorVars dump_debugcache() { TODEBUGCACHE=0 -- 2.26.2