diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-17 20:09:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-17 20:09:02 +0000 |
| commit | e0cc9415a669e965aa95a0dab02e37dfa07f4bb4 (patch) | |
| tree | e7ba5db2577a39f3fe0d5625fe7576a0d800f4c6 | |
| parent | a3232d69ce897ae20bb461823afdd1f27e22dcf7 (diff) | |
| download | portage-e0cc9415a669e965aa95a0dab02e37dfa07f4bb4.tar.gz portage-e0cc9415a669e965aa95a0dab02e37dfa07f4bb4.tar.bz2 portage-e0cc9415a669e965aa95a0dab02e37dfa07f4bb4.zip | |
Remove the rest of eblank.
svn path=/main/branches/2.1.2/; revision=10702
| -rw-r--r-- | bin/isolated-functions.sh | 13 | ||||
| -rw-r--r-- | man/color.map.5 | 3 | ||||
| -rw-r--r-- | pym/output.py | 1 | ||||
| -rw-r--r-- | pym/portage.py | 2 |
4 files changed, 2 insertions, 17 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 5851a55c7..6faa5d656 100644 --- 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 b448ba995..ac1189ecb 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/output.py b/pym/output.py index d52c6cc55..ff2944bc2 100644 --- 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 fe0ceb904..77ce475bd 100644 --- 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) |