diff options
| -rw-r--r-- | pym/_emerge/emergelog.py | 4 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pym/_emerge/emergelog.py b/pym/_emerge/emergelog.py index dbb0812ff..b25ec29b7 100644 --- a/pym/_emerge/emergelog.py +++ b/pym/_emerge/emergelog.py @@ -15,9 +15,13 @@ from portage.data import secpass from portage.output import xtermTitle _emerge_log_dir = '/var/log' +_disable = False def emergelog(xterm_titles, mystr, short_msg=None): + if _disable: + return + mystr = portage._unicode_decode(mystr) if short_msg is not None: diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 68d6aa466..f66b0bb5c 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -40,6 +40,7 @@ from _emerge.actions import action_config, action_sync, action_metadata, \ action_regen, action_search, action_uninstall, action_info, action_build, \ adjust_configs, chk_updated_cfg_files, display_missing_pkg_set, \ display_news_notification, getportageversion, load_emerge_config +import _emerge from _emerge.emergelog import emergelog from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo from _emerge.is_valid_package_atom import is_valid_package_atom @@ -1395,9 +1396,7 @@ def emerge_main(): operations. This helps minimize parallel emerge.log entries that can confuse log parsers. We especially want it disabled during parallel-fetch, which uses --resume --fetchonly.""" - global emergelog - def emergelog(*pargs, **kargs): - pass + _emerge.emergelog._disable = True else: if 'EMERGE_LOG_DIR' in settings: |