summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-26 05:39:35 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-26 05:39:35 +0000
commit2c42fed35a7352eeaacff20aa08614832d236a63 (patch)
tree6cb3824051ed58357ab13259ca1a83c0c85be3d2
parentc862f984b1fa92a56af4cc7b010f675b3fb84e4e (diff)
downloadportage-2c42fed35a7352eeaacff20aa08614832d236a63.tar.gz
portage-2c42fed35a7352eeaacff20aa08614832d236a63.tar.bz2
portage-2c42fed35a7352eeaacff20aa08614832d236a63.zip
Allow /etc/portage/color.map to control colors associated with einfo, ewarn, etc...
svn path=/main/trunk/; revision=3665
-rw-r--r--bin/isolated-functions.sh10
-rw-r--r--pym/portage.py4
2 files changed, 9 insertions, 5 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 94ff1c983..d5d9b572d 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -200,11 +200,11 @@ set_colors() {
ENDCOL=$'\e[A\e['${COLS}'C' # Now, ${ENDCOL} will move us to the end of the
# column; irregardless of character width
- GOOD=$'\e[32;01m'
- WARN=$'\e[33;01m'
- BAD=$'\e[31;01m'
- HILITE=$'\e[36;01m'
- BRACKET=$'\e[34;01m'
+ [ -z "${GOOD}" ] && GOOD=$'\e[32;01m'
+ [ -z "${WARN}" ] && WARN=$'\e[33;01m'
+ [ -z "${BAD}" ] && BAD=$'\e[31;01m'
+ [ -z "${HILITE}" ] && HILITE=$'\e[36;01m'
+ [ -z "${BRACKET}" ] && BRACKET=$'\e[34;01m'
NORMAL=$'\e[0m'
}
diff --git a/pym/portage.py b/pym/portage.py
index 7f33a2a5b..d1b8a7354 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2523,6 +2523,10 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
myso=os.uname()[2]
mysettings["KVERS"]=myso[1]
+ # Allow color.map to control colors associated with einfo, ewarn, etc...
+ for c in ("GOOD", "WARN", "BAD", "HILITE", "BRACKET"):
+ mysettings[c] = output.codes[c]
+
def prepare_build_dirs(myroot, mysettings, cleanup):
clean_dirs = [mysettings["HOME"]]