[patch] fix emerge.log disabling code

emergelog.patch (text/plain), 1.38 KB, created by Zac Medico on 2010-02-04 23:03:32 UTC

Index: pym/_emerge/emergelog.py
===================================================================
--- pym/_emerge/emergelog.py	(revision 15321)
+++ pym/_emerge/emergelog.py	(revision 15322)
@@ -15,9 +15,13 @@
 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:
Index: pym/_emerge/main.py
===================================================================
--- pym/_emerge/main.py	(revision 15321)
+++ pym/_emerge/main.py	(revision 15322)
@@ -40,6 +40,7 @@
 	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 @@
 		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: