[gentoo-commits] portage r10675 - in main/trunk: bin pym/portage

[gentoo-commits] portage r10675 - in main/trunk: bin pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-06-17 03:31:43 +0000 (Tue, 17 Jun 2008)
New Revision: 10675

Modified:
   main/trunk/bin/isolated-functions.sh
   main/trunk/pym/portage/__init__.py
   main/trunk/pym/portage/output.py
Log:
Add support for an new "eblank" elog function that shows a blank line.
Consecutive eblank calls are all collapsed into a single blank line.
Thanks to Joe Peterson <lavajoe@g.o> for this patch.


Modified: main/trunk/bin/isolated-functions.sh
===================================================================
--- main/trunk/bin/isolated-functions.sh	2008-06-16 14:41:00 UTC (rev 10674)
+++ main/trunk/bin/isolated-functions.sh	2008-06-17 03:31:43 UTC (rev 10675)
@@ -161,7 +161,7 @@
 	local messagetype
 	[ -z "${1}" -o -z "${T}" -o ! -d "${T}/logging" ] && return 1
 	case "${1}" in
-		INFO|WARN|ERROR|LOG|QA)
+		BLANK|INFO|WARN|ERROR|LOG|QA)
 			messagetype="${1}"
 			shift
 			;;
@@ -174,15 +174,28 @@
 	return 0
 }
 
+eblank() {
+	[[ ${LAST_E_CMD} == "eblank" ]] && return 0
+	elog_base BLANK
+	[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
+	echo -e " ${NEUTRAL}*${NORMAL}"
+	LAST_E_CMD="eblank"
+	return 0
+}
+
 eqawarn() {
 	elog_base QA "$*"
+	[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
 	vecho -e " ${WARN}*${NORMAL} $*" >&2
+	LAST_E_CMD="eqawarn"
 	return 0
 }
 
 elog() {
 	elog_base LOG "$*"
+	[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
 	echo -e " ${GOOD}*${NORMAL} $*"
+	LAST_E_CMD="elog"
 	return 0
 }
 
@@ -281,6 +294,7 @@
 
 	_eend ${retval} eerror "$*"
 
+	LAST_E_CMD="eend"
 	return ${retval}
 }
 
@@ -339,6 +353,7 @@
 	COLS="25 80"
 	ENDCOL=
 
+	NEUTRAL=
 	GOOD=
 	WARN=
 	BAD=
@@ -361,6 +376,7 @@
 	if [ -n "${PORTAGE_COLORMAP}" ] ; then
 		eval ${PORTAGE_COLORMAP}
 	else
+		NEUTRAL=$'\e[37m'
 		GOOD=$'\e[32;01m'
 		WARN=$'\e[33;01m'
 		BAD=$'\e[31;01m'

Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2008-06-16 14:41:00 UTC (rev 10674)
+++ main/trunk/pym/portage/__init__.py	2008-06-17 03:31:43 UTC (rev 10675)
@@ -4452,7 +4452,7 @@
 
 	# Allow color.map to control colors associated with einfo, ewarn, etc...
 	mycolors = []
-	for c in ("GOOD", "WARN", "BAD", "HILITE", "BRACKET"):
+	for c in ("NEUTRAL", "GOOD", "WARN", "BAD", "HILITE", "BRACKET"):
 		mycolors.append("%s=$'%s'" % (c, portage.output.codes[c]))
 	mysettings["PORTAGE_COLORMAP"] = "\n".join(mycolors)
 

Modified: main/trunk/pym/portage/output.py
===================================================================
--- main/trunk/pym/portage/output.py	2008-06-16 14:41:00 UTC (rev 10674)
+++ main/trunk/pym/portage/output.py	2008-06-17 03:31:43 UTC (rev 10675)
@@ -138,6 +138,7 @@
 
 # Colors from /etc/init.d/functions.sh
 codes["NORMAL"]     = esc_seq + "0m"
+codes["NEUTRAL"]    = codes["lightgray"]
 codes["GOOD"]       = codes["green"]
 codes["WARN"]       = codes["yellow"]
 codes["BAD"]        = codes["red"]

-- 
gentoo-commits@lists.gentoo.org mailing list