From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 23 Oct 2010 22:55:36 +0000 (-0700)
Subject: JobStatusDisplay: add a _set_width() method
X-Git-Tag: v2.2.0_alpha2~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91f93769b65a9d02b7561adc3570bb1df0567a09;p=portage.git

JobStatusDisplay: add a _set_width() method
---

diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py
index 200e196b5..d3d330d30 100644
--- a/pym/_emerge/JobStatusDisplay.py
+++ b/pym/_emerge/JobStatusDisplay.py
@@ -47,11 +47,6 @@ class JobStatusDisplay(object):
 		object.__setattr__(self, "_displayed", False)
 		object.__setattr__(self, "_last_display_time", 0)
 
-		width = portage.output.get_term_size()[1]
-		if width <= 0 or width > 80:
-			width = 80
-		object.__setattr__(self, "width", width)
-		object.__setattr__(self, "_jobs_column_width", width - 32)
 		self.reset()
 
 		isatty = os.environ.get('TERM') != 'dumb' and \
@@ -68,6 +63,20 @@ class JobStatusDisplay(object):
 			if not isinstance(v, basestring):
 				self._term_codes[k] = v.decode(encoding, 'replace')
 
+		if self._isatty:
+			width = portage.output.get_term_size()[1]
+		else:
+			width = 80
+		self._set_width(width)
+
+	def _set_width(self, width):
+		if width == getattr(self, 'width', None):
+			return
+		if width <= 0 or width > 80:
+			width = 80
+		object.__setattr__(self, "width", width)
+		object.__setattr__(self, "_jobs_column_width", width - 32)
+
 	@property
 	def out(self):
 		"""Use a lazy reference to sys.stdout, in case the API consumer has