diff options
| -rwxr-xr-x | bin/isolated-functions.sh | 6 | ||||
| -rw-r--r-- | man/color.map.5 | 3 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 2 | ||||
| -rw-r--r-- | pym/portage/elog/mod_echo.py | 3 | ||||
| -rw-r--r-- | pym/portage/output.py | 16 |
5 files changed, 24 insertions, 6 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index dd157129d..5851a55c7 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -178,7 +178,7 @@ eblank() { [[ ${LAST_E_CMD} == "eblank" ]] && return 0 elog_base BLANK [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo - echo -e " ${NEUTRAL}*${NORMAL}" + echo -e " ${BLANK}*${NORMAL}" LAST_E_CMD="eblank" return 0 } @@ -353,7 +353,7 @@ unset_colors() { COLS="25 80" ENDCOL= - NEUTRAL= + BLANK= GOOD= WARN= BAD= @@ -376,7 +376,7 @@ set_colors() { if [ -n "${PORTAGE_COLORMAP}" ] ; then eval ${PORTAGE_COLORMAP} else - NEUTRAL=$'\e[37m' + 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 39f76a4cb..14fa5a2e4 100644 --- a/man/color.map.5 +++ b/man/color.map.5 @@ -27,6 +27,9 @@ Defines color used for highlighted words. \fBINFORM\fR = \fI"darkgreen"\fR Defines color used for informational words. .TP +\fBBLANK\fR = \fI"darkgray"\fR +Defines color used to display eblank lines. +.TP \fBMERGE_LIST_PROGRESS\fR = \fI"yellow"\fR Defines color used for numbers indicating merge progress. .TP diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 45d27aede..4970d1a11 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 ("NEUTRAL", "GOOD", "WARN", "BAD", "HILITE", "BRACKET"): + for c in ("BLANK", "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/elog/mod_echo.py b/pym/portage/elog/mod_echo.py index 30d88f005..1c83600a4 100644 --- a/pym/portage/elog/mod_echo.py +++ b/pym/portage/elog/mod_echo.py @@ -33,7 +33,8 @@ def finalize(mysettings=None): "WARN": printer.ewarn, "ERROR": printer.eerror, "LOG": printer.einfo, - "QA": printer.ewarn} + "QA": printer.ewarn, + "BLANK": printer.eblank} if isinstance(msgcontent, basestring): msgcontent = [msgcontent] for line in msgcontent: diff --git a/pym/portage/output.py b/pym/portage/output.py index 3c6533106..4d0ab42ec 100644 --- a/pym/portage/output.py +++ b/pym/portage/output.py @@ -138,7 +138,7 @@ codes["bg_darkyellow"] = codes["bg_brown"] # Colors from /etc/init.d/functions.sh codes["NORMAL"] = esc_seq + "0m" -codes["NEUTRAL"] = codes["lightgray"] +codes["BLANK"] = codes["lightgray"] codes["GOOD"] = codes["green"] codes["WARN"] = codes["yellow"] codes["BAD"] = codes["red"] @@ -544,6 +544,20 @@ class EOutput(object): sys.stdout.flush() self.__last_e_cmd = "ewarn" + def eblank(self, msg): + """ + Shows a blank line. Consecutive eblank calls are all collapsed + into a single blank line. + """ + if self.__last_e_cmd == "eblank": + return + if not self.quiet: + if self.__last_e_cmd == "ebegin": + sys.stdout.write("\n") + sys.stdout.write(colorize("BLANK", " * ") + "\n") + sys.stdout.flush() + self.__last_e_cmd = "eblank" + def ewend(self, errno, *msg): """ Indicates the completion of a process, optionally displaying a message |