| 1 |
commit: 1d6e6b2fe3b0107153b76dfe84ef8b2dc8240658 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 27 22:37:47 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 27 22:37:47 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d6e6b2f |
| 7 |
|
| 8 |
display_merge: tweak background/logging logic |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/dbapi/vartree.py | 8 +++++--- |
| 12 |
1 files changed, 5 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 15 |
index e9b183e..08263d6 100644 |
| 16 |
--- a/pym/portage/dbapi/vartree.py |
| 17 |
+++ b/pym/portage/dbapi/vartree.py |
| 18 |
@@ -1731,11 +1731,13 @@ class dblink(object): |
| 19 |
if self._scheduler is None: |
| 20 |
writemsg_level(msg, level=level, noiselevel=noiselevel) |
| 21 |
else: |
| 22 |
- log_path = self.settings.get("PORTAGE_LOG_FILE") |
| 23 |
+ log_path = None |
| 24 |
+ if self.settings.get("PORTAGE_BACKGROUND") != "subprocess": |
| 25 |
+ log_path = self.settings.get("PORTAGE_LOG_FILE") |
| 26 |
background = self.settings.get("PORTAGE_BACKGROUND") == "1" |
| 27 |
|
| 28 |
- if log_path is None: |
| 29 |
- if not (background and level < logging.WARN): |
| 30 |
+ if background and log_path is None: |
| 31 |
+ if level >= logging.WARN: |
| 32 |
writemsg_level(msg, level=level, noiselevel=noiselevel) |
| 33 |
else: |
| 34 |
self._scheduler.output(msg, |
Archives