From ba72176df9f2273a139cb4d557ef6cd218bab677 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 2 May 2007 19:51:30 +0000 Subject: [PATCH] Merged from trunk 6466:6467 +------------------------------------------------------------------------+ | 6467 | Fix eend so that it works properly on a standard BSD | | zmedico | console. Thanks to UberLord. | +------------------------------------------------------------------------+ svn path=/main/branches/prefix/; revision=6470 --- bin/isolated-functions.sh | 2 ++ pym/portage/output.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index d994333fe..ac10d087f 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -281,6 +281,8 @@ set_colors() { (( 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" ] && COLS=$((${COLS} - 1)) ENDCOL=$'\e[A\e['${COLS}'C' # Now, ${ENDCOL} will move us to the end of the # column; irregardless of character width diff --git a/pym/portage/output.py b/pym/portage/output.py index d7f051f53..406f02b53 100644 --- a/pym/portage/output.py +++ b/pym/portage/output.py @@ -277,6 +277,9 @@ class EOutput: pass if columns <= 0: columns = 80 + # Adjust columns so that eend works properly on a standard BSD console. + if os.environ.get("TERM") == "cons25": + columns = columns - 1 self.term_columns = columns def __eend(self, caller, errno, msg): -- 2.26.2