Merged from trunk 8467:8468

   | 8468    | Tweak EOutput.term_columns calculation for TERM="dumb" so    |
   | zmedico | that it behaves like TERM="cons25" currently does. Thanks to |
   |         | Ulrich Mueller <ulm@gentoo.org> for the patch.               |

svn path=/main/branches/prefix/; revision=8470

diff --git a/pym/portage/output.py b/pym/portage/output.py
index ff3e27171c06f44a8ec2543757223449453bbf24..9eae2ee87bb9e3a3ae92bc1ec5ed9b30da728063 100644 (file)
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -382,7 +382,7 @@ class EOutput(object):
                if columns <= 0:
                        columns = 80
                # Adjust columns so that eend works properly on a standard BSD console.
-               if os.environ.get("TERM") == "cons25":
+               if os.environ.get("TERM") in ("cons25", "dumb"):
                        columns = columns - 1
                self.term_columns = columns