Merged from trunk 10703:10704

   | 10704   | More eblank.                                                 |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=10705

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index b0a6d114ecd31c765c6ae5a289f8a72e214121c4..1a7fa96dce1ee37328fc772bb9366158f45c2bb7 100755 (executable)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -353,7 +353,6 @@ unset_colors() {
        COLS="25 80"
        ENDCOL=
 
-       BLANK=
        GOOD=
        WARN=
        BAD=
@@ -376,7 +375,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 ba1bd2d5d23f400703af8136592326330361f6af..629ef52cadd4a3b8c5b58f878bc3e039efc89440 100644 (file)
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -324,9 +324,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 acb23ee9212be407d14fce3d6ac0cc7ecc096ae8..39f76a4cb882eff14ea63cc13c5e83d15e3b4c6e 100644 (file)
--- 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 b8d7bfd958dc0ce7d6634155c537732955096214..639056a1eddb3e7ca8814fffef42cb27983fb82e 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4501,7 +4501,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 482747e35ecebb9fcb70ac48c857517873327c01..a7a500cd4f120efcf208cc8a87a85c79819c83a9 100644 (file)
--- 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"]