Attachment #224455 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 - 6 ))s%b\n" '' "${msg}"

}

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 ))
	# Adjust COLS so that eend works properly on a standard BSD console
	# or in a curses window.
	((COLS--))

	# Now, ${ENDCOL} will move us to the end of the
	# column;  irregardless of character width
	ENDCOL=$'\e[A\e['$(( COLS - 7 ))'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
		# or in a curses window.
		columns = columns - 1
		self.term_columns = columns
		sys.stdout.flush()
		sys.stderr.flush()

		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-332 _eend() { Link Here

(-)portage.orig//bin/isolated-functions.sh (-6 / +6 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 - 6 ))s%b\n" '' "${msg}"
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	415	# Adjust COLS so that eend works properly on a standard BSD console
416	# Adjust COLS so that eend works properly on a standard BSD console.	416	# or in a curses window.
417	[[ $TERM = cons25 \|\| $TERM = dumb ]] && ((COLS--))	417	((COLS--))
418		418
419	# Now, ${ENDCOL} will move us to the end of the	419	# Now, ${ENDCOL} will move us to the end of the
420	# column; irregardless of character width	420	# column; irregardless of character width
421	ENDCOL=$'\e[A\e['${COLS}'C'	421	ENDCOL=$'\e[A\e['$(( COLS - 7 ))'C'
422	if [ -n "${PORTAGE_COLORMAP}" ] ; then	422	if [ -n "${PORTAGE_COLORMAP}" ] ; then
423	eval ${PORTAGE_COLORMAP}	423	eval ${PORTAGE_COLORMAP}
424	else	424	else

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

(-)portage.orig//pym/portage/output.py (-4 / +4 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.	490	# Adjust columns so that eend works properly on a standard BSD console
491	if os.environ.get("TERM") in ("cons25", "dumb"):	491	# or in a curses window.
492	columns = columns - 1	492	columns = columns - 1
493	self.term_columns = columns	493	self.term_columns = columns
494	sys.stdout.flush()	494	sys.stdout.flush()
495	sys.stderr.flush()	495	sys.stderr.flush()
Lines 532-538 class EOutput(object): Link Here
532	msg += " ..."	532	msg += " ..."
533	if not self.quiet:	533	if not self.quiet:
534	self.einfon(msg)	534	self.einfon(msg)
535	self.__last_e_len = len(msg) + 4	535	self.__last_e_len = len(msg) + 3
536	self.__last_e_cmd = "ebegin"	536	self.__last_e_cmd = "ebegin"
537		537
538	def eend(self, errno, *msg):	538	def eend(self, errno, *msg):