Attachment #224457 for bug #309149




	fi

	if [[ ${RC_ENDCOL} == "yes" ]] ; then
		echo -e "${ENDCOL} ${msg}"
	else
		[[ ${LAST_E_CMD} == ebegin ]] || LAST_E_LEN=0
		printf "%$(( COLS - LAST_E_LEN - 7 ))s%b\n" '' "${msg}"
	fi

	return ${retval}

}

unset_colors() {
	COLS=80
	ENDCOL=

	GOOD=

	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 - 8 ))'C'
	if [ -n "${PORTAGE_COLORMAP}" ] ; then
		eval ${PORTAGE_COLORMAP}
	else




		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()

		if not self.quiet:
			out = sys.stdout
			self._write(out,
				"%*s%s\n" % ((self.term_columns - self.__last_e_len - 7),
				"", status_brackets))

	def ebegin(self, msg):

		msg += " ..."
		if not self.quiet:
			self.einfon(msg)
		self.__last_e_len = len(msg) + 3
		self.__last_e_cmd = "ebegin"

	def eend(self, errno, *msg):

Return to bug 309149

Lines 326-335 _eend() { Link Here

(-)portage.orig//bin/isolated-functions.sh (-7 / +4 lines)
326	fi	326	fi
327		327
328	if [[ ${RC_ENDCOL} == "yes" ]] ; then	328	if [[ ${RC_ENDCOL} == "yes" ]] ; then
329	echo -e "${ENDCOL} ${msg}"	329	echo -e "${ENDCOL} ${msg}"
330	else	330	else
331	[[ ${LAST_E_CMD} == ebegin ]] \|\| LAST_E_LEN=0	331	[[ ${LAST_E_CMD} == ebegin ]] \|\| LAST_E_LEN=0
332	printf "%$(( COLS - LAST_E_LEN - 6 ))s%b\n" '' "${msg}"	332	printf "%$(( COLS - LAST_E_LEN - 7 ))s%b\n" '' "${msg}"
333	fi	333	fi
334		334
335	return ${retval}	335	return ${retval}
Lines 397-403 get_KV() { Link Here
397	}	397	}
398		398
399	unset_colors() {	399	unset_colors() {
400	COLS="25 80"	400	COLS=80
401	ENDCOL=	401	ENDCOL=
402		402
403	GOOD=	403	GOOD=
Lines 412-424 set_colors() { Link Here
412	COLS=${COLUMNS:-0} # bash's internal COLUMNS variable	412	COLS=${COLUMNS:-0} # bash's internal COLUMNS variable
413	(( COLS == 0 )) && COLS=$(set -- $(stty size 2>/dev/null) ; echo $2)	413	(( COLS == 0 )) && COLS=$(set -- $(stty size 2>/dev/null) ; echo $2)
414	(( COLS > 0 )) \|\| (( COLS = 80 ))	414	(( COLS > 0 )) \|\| (( COLS = 80 ))
415	COLS=$((${COLS} - 8)) # width of [ ok ] == 7
416	# Adjust COLS so that eend works properly on a standard BSD console.
417	[[ $TERM = cons25 \|\| $TERM = dumb ]] && ((COLS--))
418		415
419	# Now, ${ENDCOL} will move us to the end of the	416	# Now, ${ENDCOL} will move us to the end of the
420	# column; irregardless of character width	417	# column; irregardless of character width
421	ENDCOL=$'\e[A\e['${COLS}'C'	418	ENDCOL=$'\e[A\e['$(( COLS - 8 ))'C'
422	if [ -n "${PORTAGE_COLORMAP}" ] ; then	419	if [ -n "${PORTAGE_COLORMAP}" ] ; then
423	eval ${PORTAGE_COLORMAP}	420	eval ${PORTAGE_COLORMAP}
424	else	421	else

Lines 487-495 class EOutput(object): Link Here

(-)portage.orig//pym/portage/output.py (-5 / +2 lines)
487	lines, columns = get_term_size()	487	lines, columns = get_term_size()
488	if columns <= 0:	488	if columns <= 0:
489	columns = 80	489	columns = 80
490	# Adjust columns so that eend works properly on a standard BSD console.
491	if os.environ.get("TERM") in ("cons25", "dumb"):
492	columns = columns - 1
493	self.term_columns = columns	490	self.term_columns = columns
494	sys.stdout.flush()	491	sys.stdout.flush()
495	sys.stderr.flush()	492	sys.stderr.flush()
Lines 518-524 class EOutput(object): Link Here
518	if not self.quiet:	515	if not self.quiet:
519	out = sys.stdout	516	out = sys.stdout
520	self._write(out,	517	self._write(out,
521	"%*s%s\n" % ((self.term_columns - self.__last_e_len - 6),	518	"%*s%s\n" % ((self.term_columns - self.__last_e_len - 7),
522	"", status_brackets))	519	"", status_brackets))
523		520
524	def ebegin(self, msg):	521	def ebegin(self, msg):
Lines 532-538 class EOutput(object): Link Here
532	msg += " ..."	529	msg += " ..."
533	if not self.quiet:	530	if not self.quiet:
534	self.einfon(msg)	531	self.einfon(msg)
535	self.__last_e_len = len(msg) + 4	532	self.__last_e_len = len(msg) + 3
536	self.__last_e_cmd = "ebegin"	533	self.__last_e_cmd = "ebegin"
537		534
538	def eend(self, errno, *msg):	535	def eend(self, errno, *msg):