summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-17 20:16:03 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-17 20:16:03 +0000
commiteebeccdba46000fb151735154ab863b2f614b328 (patch)
treea29d9883fdec80f6b1200f062904e2bbd93acd4e
parentRemove eblank docs. (diff)
downloadportage-idfetch-eebeccdba46000fb151735154ab863b2f614b328.tar.gz
portage-idfetch-eebeccdba46000fb151735154ab863b2f614b328.tar.bz2
portage-idfetch-eebeccdba46000fb151735154ab863b2f614b328.zip
More eblank.
svn path=/main/trunk/; revision=10704
-rwxr-xr-xbin/isolated-functions.sh2
-rw-r--r--cnf/make.conf4
-rw-r--r--man/color.map.53
-rw-r--r--pym/portage/__init__.py2
-rw-r--r--pym/portage/output.py1
5 files changed, 3 insertions, 9 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 1eacf441..6faa5d65 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -344,7 +344,6 @@ unset_colors() {
COLS="25 80"
ENDCOL=
- BLANK=
GOOD=
WARN=
BAD=
@@ -367,7 +366,6 @@ set_colors() {
if [ -n "${PORTAGE_COLORMAP}" ] ; then
eval ${PORTAGE_COLORMAP}
else
- BLANK=$'\e[37m'
GOOD=$'\e[32;01m'
WARN=$'\e[33;01m'
BAD=$'\e[31;01m'
diff --git a/cnf/make.conf b/cnf/make.conf
index bc9a8f40..ecc382b9 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -315,9 +315,9 @@
# logging related variables:
# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
-# blank, info, warn, error, log, qa, *
+# info, warn, error, log, qa, *
# Warning: commenting this will disable elog
-PORTAGE_ELOG_CLASSES="blank log warn error"
+PORTAGE_ELOG_CLASSES="log warn error"
# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
# included in portage are (empty means logging is disabled):
diff --git a/man/color.map.5 b/man/color.map.5
index acb23ee9..39f76a4c 100644
--- a/man/color.map.5
+++ b/man/color.map.5
@@ -15,9 +15,6 @@ value defined internally.
\fBBAD\fR = \fI"red"\fR
Defines color used for some words occuring in bad context.
.TP
-\fBBLANK\fR = \fI"lightgray"\fR
-Defines color used to display eblank lines.
-.TP
\fBBRACKET\fR = \fI"blue"\fR
Defines color used for brackets.
.TP
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4970d1a1..6b35f179 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4452,7 +4452,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
# Allow color.map to control colors associated with einfo, ewarn, etc...
mycolors = []
- for c in ("BLANK", "GOOD", "WARN", "BAD", "HILITE", "BRACKET"):
+ for c in ("GOOD", "WARN", "BAD", "HILITE", "BRACKET"):
mycolors.append("%s=$'%s'" % (c, portage.output.codes[c]))
mysettings["PORTAGE_COLORMAP"] = "\n".join(mycolors)
diff --git a/pym/portage/output.py b/pym/portage/output.py
index 482747e3..a7a500cd 100644
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -138,7 +138,6 @@ codes["bg_darkyellow"] = codes["bg_brown"]
# Colors from /etc/init.d/functions.sh
codes["NORMAL"] = esc_seq + "0m"
-codes["BLANK"] = codes["lightgray"]
codes["GOOD"] = codes["green"]
codes["WARN"] = codes["yellow"]
codes["BAD"] = codes["red"]