Bug #324191 - Add support for FEATURES=compress-build-logs. The causes

all build logs to be compressed while they are being written. Log file
names have an extension that is appropriate for the compression type.
Currently, only gzip(1) compression is supported, so build logs will
have a '.gz' extension when this feature is enabled.

1 files changed, 7 insertions, 27 deletions

diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index 7fbc66849..d2d4dce3a 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -75,24 +75,11 @@ class EbuildPhase(CompositeTask):
 
 		if self.phase == "install":
 			out = portage.StringIO()
-			log_path = self.settings.get("PORTAGE_LOG_FILE")
-			log_file = None
-			if log_path is not None:
-				log_file = codecs.open(_unicode_encode(log_path,
-					encoding=_encodings['fs'], errors='strict'),
-					mode='a', encoding=_encodings['content'], errors='replace')
-			try:
-				_check_build_log(self.settings, out=out)
-				msg = _unicode_decode(out.getvalue(),
-					encoding=_encodings['content'], errors='replace')
-				if msg:
-					if not self.background:
-						writemsg_stdout(msg, noiselevel=-1)
-					if log_file is not None:
-						log_file.write(msg)
-			finally:
-				if log_file is not None:
-					log_file.close()
+			_check_build_log(self.settings, out=out)
+			msg = _unicode_decode(out.getvalue(),
+				encoding=_encodings['content'], errors='replace')
+			self.scheduler.output(msg,
+				log_path=self.settings.get("PORTAGE_LOG_FILE"))
 
 		if fail:
 			self._die_hooks()
@@ -108,15 +95,8 @@ class EbuildPhase(CompositeTask):
 			msg = _unicode_decode(out.getvalue(),
 				encoding=_encodings['content'], errors='replace')
 			if msg:
-				if not self.background:
-					writemsg_stdout(msg, noiselevel=-1)
-				log_path = self.settings.get("PORTAGE_LOG_FILE")
-				if log_path is not None:
-					log_file = codecs.open(_unicode_encode(log_path,
-						encoding=_encodings['fs'], errors='strict'),
-						mode='a', encoding=_encodings['content'], errors='replace')
-					log_file.write(msg)
-					log_file.close()
+				self.scheduler.output(msg,
+					log_path=self.settings.get("PORTAGE_LOG_FILE"))
 
 		post_phase_cmds = _post_phase_cmds.get(self.phase)
 		if post_phase_cmds is not None: