Remove the rest of eblank.

svn path=/main/branches/2.1.2/; revision=10702

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 5851a55c7c6d56cac734fc54d94516837150f438..6faa5d656758a221649d5ef364b18c6f5c15ca71 100644 (file)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -161,7 +161,7 @@ elog_base() {
        local messagetype
        [ -z "${1}" -o -z "${T}" -o ! -d "${T}/logging" ] && return 1
        case "${1}" in
-               BLANK|INFO|WARN|ERROR|LOG|QA)
+               INFO|WARN|ERROR|LOG|QA)
                        messagetype="${1}"
                        shift
                        ;;
@@ -174,15 +174,6 @@ elog_base() {
        return 0
 }
 
-eblank() {
-       [[ ${LAST_E_CMD} == "eblank" ]] && return 0
-       elog_base BLANK
-       [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
-       echo -e " ${BLANK}*${NORMAL}"
-       LAST_E_CMD="eblank"
-       return 0
-}
-
 eqawarn() {
        elog_base QA "$*"
        [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
@@ -353,7 +344,6 @@ unset_colors() {
        COLS="25 80"
        ENDCOL=
 
-       BLANK=
        GOOD=
        WARN=
        BAD=
@@ -376,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/man/color.map.5 b/man/color.map.5
index b448ba995ae552f4ae5c7e0ee746aea006dc95d9..ac1189ecb102cfcc6e4d5e46e7aa16f42d0652d9 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/output.py b/pym/output.py
index d52c6cc557da5ceaaffc8dd7e0b06d523cae4622..ff2944bc2398a62147195aff9514d3848a13c8a2 100644 (file)
--- a/pym/output.py
+++ b/pym/output.py
@@ -132,7 +132,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"]

diff --git a/pym/portage.py b/pym/portage.py
index fe0ceb904567112c4882540e8f1d047a365eefe2..77ce475bd9e07833451b88396728aa46aed9d68d 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4462,7 +4462,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, output.codes[c]))
        mysettings["PORTAGE_COLORMAP"] = "\n".join(mycolors)