Attachment #218467 for bug #303401

View | Details | Raw Unified | Return to bug 303401
Collapse All | Expand All

Lines 15-23 Link Here

(-)pym/_emerge/emergelog.py (+4 lines)
15	from portage.output import xtermTitle	15	from portage.output import xtermTitle
16		16
17	_emerge_log_dir = '/var/log'	17	_emerge_log_dir = '/var/log'
		18	_disable = False
18		19
19	def emergelog(xterm_titles, mystr, short_msg=None):	20	def emergelog(xterm_titles, mystr, short_msg=None):
20		21
		22	if _disable:
		23	return
		24
21	mystr = portage._unicode_decode(mystr)	25	mystr = portage._unicode_decode(mystr)
22		26
23	if short_msg is not None:	27	if short_msg is not None:




	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

		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."""
		_emerge.emergelog._disable = True
		def emergelog(*pargs, **kargs):
			pass

	else:
		if 'EMERGE_LOG_DIR' in settings:

Return to bug 303401

Lines 40-45 Link Here

(-)pym/_emerge/main.py (-3 / +2 lines)
40	action_regen, action_search, action_uninstall, action_info, action_build, \	40	action_regen, action_search, action_uninstall, action_info, action_build, \
41	adjust_configs, chk_updated_cfg_files, display_missing_pkg_set, \	41	adjust_configs, chk_updated_cfg_files, display_missing_pkg_set, \
42	display_news_notification, getportageversion, load_emerge_config	42	display_news_notification, getportageversion, load_emerge_config
		43	import _emerge
43	from _emerge.emergelog import emergelog	44	from _emerge.emergelog import emergelog
44	from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo	45	from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo
45	from _emerge.is_valid_package_atom import is_valid_package_atom	46	from _emerge.is_valid_package_atom import is_valid_package_atom
Lines 1395-1403 Link Here
1395	operations. This helps minimize parallel emerge.log entries that can	1396	operations. This helps minimize parallel emerge.log entries that can
1396	confuse log parsers. We especially want it disabled during	1397	confuse log parsers. We especially want it disabled during
1397	parallel-fetch, which uses --resume --fetchonly."""	1398	parallel-fetch, which uses --resume --fetchonly."""
1398	global emergelog	1399	_emerge.emergelog._disable = True
1399	def emergelog(pargs, *kargs):
1400	pass
1401		1400
1402	else:	1401	else:
1403	if 'EMERGE_LOG_DIR' in settings:	1402	if 'EMERGE_LOG_DIR' in settings: