From a55c1f30f05202f6cbf04c8748b3c615b7ad7306 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 20 Mar 2010 23:46:24 +0000 Subject: =?UTF-8?q?Bug=20#309149=20-=20Unify=20look=20of=20eend=20used=20i?= =?UTF-8?q?n=20bash=20&=20python=20code,=20additionally=20fixing=20few=20i?= =?UTF-8?q?nconsistences=20in=20bash=20code.=20Thanks=20to=20Micha=C5=82?= =?UTF-8?q?=20G=C3=B3rny=20=20for=20this=20patch.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/main/trunk/; revision=15839 --- pym/portage/output.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pym') diff --git a/pym/portage/output.py b/pym/portage/output.py index 971400d76..4d8eb94fa 100644 --- a/pym/portage/output.py +++ b/pym/portage/output.py @@ -487,9 +487,6 @@ class EOutput(object): 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() @@ -518,7 +515,7 @@ class EOutput(object): if not self.quiet: out = sys.stdout self._write(out, - "%*s%s\n" % ((self.term_columns - self.__last_e_len - 6), + "%*s%s\n" % ((self.term_columns - self.__last_e_len - 7), "", status_brackets)) def ebegin(self, msg): @@ -532,7 +529,7 @@ class EOutput(object): msg += " ..." if not self.quiet: self.einfon(msg) - self.__last_e_len = len(msg) + 4 + self.__last_e_len = len(msg) + 3 self.__last_e_cmd = "ebegin" def eend(self, errno, *msg): -- cgit v1.2.3-1-g7c22