From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 20 Mar 2010 23:46:24 +0000 (-0000)
Subject: Bug #309149 - Unify look of eend used in bash & python code, additionally
X-Git-Tag: v2.2_rc68~703
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a55c1f30f05202f6cbf04c8748b3c615b7ad7306;p=portage.git

Bug #309149 - Unify look of eend used in bash & python code, additionally
fixing few inconsistences in bash code. Thanks to Michał Górny
<gentoo@mgorny.alt.pl> for this patch.

svn path=/main/trunk/; revision=15839
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 815e4e5d6..630801304 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -326,10 +326,10 @@ _eend() {
 	fi
 
 	if [[ ${RC_ENDCOL} == "yes" ]] ; then
-		echo -e "${ENDCOL}  ${msg}"
+		echo -e "${ENDCOL} ${msg}"
 	else
 		[[ ${LAST_E_CMD} == ebegin ]] || LAST_E_LEN=0
-		printf "%$(( COLS - LAST_E_LEN - 6 ))s%b\n" '' "${msg}"
+		printf "%$(( COLS - LAST_E_LEN - 7 ))s%b\n" '' "${msg}"
 	fi
 
 	return ${retval}
@@ -397,7 +397,7 @@ get_KV() {
 }
 
 unset_colors() {
-	COLS="25 80"
+	COLS=80
 	ENDCOL=
 
 	GOOD=
@@ -412,13 +412,10 @@ set_colors() {
 	COLS=${COLUMNS:-0}      # bash's internal COLUMNS variable
 	(( COLS == 0 )) && COLS=$(set -- $(stty size 2>/dev/null) ; echo $2)
 	(( COLS > 0 )) || (( COLS = 80 ))
-	COLS=$((${COLS} - 8))	# width of [ ok ] == 7
-	# Adjust COLS so that eend works properly on a standard BSD console.
-	[[ $TERM = cons25 || $TERM = dumb ]] && ((COLS--))
 
 	# Now, ${ENDCOL} will move us to the end of the
 	# column;  irregardless of character width
-	ENDCOL=$'\e[A\e['${COLS}'C'
+	ENDCOL=$'\e[A\e['$(( COLS - 8 ))'C'
 	if [ -n "${PORTAGE_COLORMAP}" ] ; then
 		eval ${PORTAGE_COLORMAP}
 	else
diff --git a/pym/portage/output.py b/pym/portage/output.py
index 971400d76..4d8eb94fa 100644
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -487,9 +487,6 @@ class EOutput(object):
 		lines, columns = get_term_size()
 		if columns <= 0:
 			columns = 80
-		# Adjust columns so that eend works properly on a standard BSD console.
-		if os.environ.get("TERM") in ("cons25", "dumb"):
-			columns = columns - 1
 		self.term_columns = columns
 		sys.stdout.flush()
 		sys.stderr.flush()
@@ -518,7 +515,7 @@ class EOutput(object):
 		if not self.quiet:
 			out = sys.stdout
 			self._write(out,
-				"%*s%s\n" % ((self.term_columns - self.__last_e_len - 6),
+				"%*s%s\n" % ((self.term_columns - self.__last_e_len - 7),
 				"", status_brackets))
 
 	def ebegin(self, msg):
@@ -532,7 +529,7 @@ class EOutput(object):
 		msg += " ..."
 		if not self.quiet:
 			self.einfon(msg)
-		self.__last_e_len = len(msg) + 4
+		self.__last_e_len = len(msg) + 3
 		self.__last_e_cmd = "ebegin"
 
 	def eend(self, errno, *msg):