From 00da064f0810372a440095e1af07d805cb8db4e3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 16 Jul 2008 00:44:58 +0000 Subject: Redirect dblink.unmerge() output to the log file when --jobs > 1. svn path=/main/trunk/; revision=11065 --- pym/_emerge/__init__.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'pym/_emerge/__init__.py') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 8e5c64eca..9046dd265 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8320,7 +8320,7 @@ class Scheduler(PollScheduler): _fetch_log = "/var/log/emerge-fetch.log" class _iface_class(SlotObject): - __slots__ = ("dblinkEbuildPhase", "fetch", + __slots__ = ("dblinkEbuildPhase", "dblinkDisplayUnmerge", "fetch", "register", "schedule", "unregister") class _fetch_iface_class(SlotObject): @@ -8385,6 +8385,7 @@ class Scheduler(PollScheduler): schedule=self._schedule_fetch) self._sched_iface = self._iface_class( dblinkEbuildPhase=self._dblink_ebuild_phase, + dblinkDisplayUnmerge=self._dblink_display_unmerge, fetch=fetch_iface, register=self._register, schedule=self._schedule_wait, unregister=self._unregister) @@ -8574,6 +8575,16 @@ class Scheduler(PollScheduler): finally: f.close() + def _dblink_display_unmerge(self, settings, msg, noiselevel=0): + log_path = settings.get("PORTAGE_LOG_FILE") + background = self._max_jobs > 1 + if log_path is None: + portage.writemsg_stdout(msg, noiselevel=noiselevel) + else: + if not background: + portage.writemsg_stdout(msg, noiselevel=noiselevel) + self._append_to_log_path(log_path, msg) + def _dblink_ebuild_phase(self, pkg_dblink, pkg_dbapi, ebuild_path, phase): """ -- cgit v1.2.3-1-g7c22