* Add a new portage.util.writemsg_level() function which uses a "level"

  parameter to control whether the message is sent to stdout or stderr.
  When level >= logging.WARNING then the message is sent to stderr,
  otherwise it is sent to stdout. The noiselevel is passed directly to
  writemsg().

* Use writemsg_level() for handling merge messages from dblink and add
  appropriate noiselevel values to each call.

* Add a writemsg_level parameter to portage.env_update() so that dblink
  can pass in dblink._display_merge() as a means to redirect output back
  to the scheduler for appropriate handling when running in the background.

svn path=/main/trunk/; revision=11098

1 files changed, 5 insertions, 10 deletions

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 8e4dd5e19..df4de0b7c 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8625,22 +8625,17 @@ class Scheduler(PollScheduler):
 		finally:
 			f.close()
 
-	def _dblink_display_merge(self, pkg_dblink, msg, level=0):
+	def _dblink_display_merge(self, pkg_dblink, msg, level=0, noiselevel=0):
 		log_path = pkg_dblink.settings.get("PORTAGE_LOG_FILE")
 		background = self._max_jobs > 1
 
-		if level >= logging.WARNING:
-			noiselevel = -1
-			msg_func = writemsg
-		else:
-			noiselevel = 0
-			msg_func = portage.writemsg_stdout
-
 		if log_path is None:
-			msg_func(msg, noiselevel=noiselevel)
+			portage.util.writemsg_level(msg,
+				level=level, noiselevel=noiselevel)
 		else:
 			if not background:
-				msg_func(msg, noiselevel=noiselevel)
+				portage.util.writemsg_level(msg,
+					level=level, noiselevel=noiselevel)
 			self._append_to_log_path(log_path, msg)
 
 	def _dblink_ebuild_phase(self,