summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-03-27 15:37:47 -0700
committerZac Medico <zmedico@gentoo.org>2011-03-27 15:37:47 -0700
commit1d6e6b2fe3b0107153b76dfe84ef8b2dc8240658 (patch)
treea182f8c03b8ef6c365d9ffd33e82f054739b7ba7 /pym
parenteee5cda2c8be4957b8e2e5fe1cd1bb42e2d4edcf (diff)
downloadportage-1d6e6b2fe3b0107153b76dfe84ef8b2dc8240658.tar.gz
portage-1d6e6b2fe3b0107153b76dfe84ef8b2dc8240658.tar.bz2
portage-1d6e6b2fe3b0107153b76dfe84ef8b2dc8240658.zip
display_merge: tweak background/logging logicv2.2.0_alpha29
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/dbapi/vartree.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e9b183ec9..08263d6d3 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1731,11 +1731,13 @@ class dblink(object):
if self._scheduler is None:
writemsg_level(msg, level=level, noiselevel=noiselevel)
else:
- log_path = self.settings.get("PORTAGE_LOG_FILE")
+ log_path = None
+ if self.settings.get("PORTAGE_BACKGROUND") != "subprocess":
+ log_path = self.settings.get("PORTAGE_LOG_FILE")
background = self.settings.get("PORTAGE_BACKGROUND") == "1"
- if log_path is None:
- if not (background and level < logging.WARN):
+ if background and log_path is None:
+ if level >= logging.WARN:
writemsg_level(msg, level=level, noiselevel=noiselevel)
else:
self._scheduler.output(msg,