summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/isolated-functions.sh2
-rw-r--r--pym/portage/output.py3
2 files changed, 5 insertions, 0 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 41595ea30..e6517af74 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -279,6 +279,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 bbac9d97d..75e9aad42 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):