commit: 7af6ebcf89684464488684ee3dc349827ddd7f46
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 5 21:35:47 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue Apr 5 21:35:47 2016 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=7af6ebcf
remove log file from summery text
pym/tbc/build_log.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py
index 5476592..2a00b95 100644
--- a/pym/tbc/build_log.py
+++ b/pym/tbc/build_log.py
@@ -292,16 +292,17 @@ def add_buildlog_main(settings, pkg, trees):
build_log_dict = {}
build_log_dict = get_buildlog_info(session, settings, pkg, build_dict,
config_id)
error_log_list = build_log_dict['error_log_list']
+ build_log_dict['logfilename'] =
settings.get("PORTAGE_LOG_FILE").split(host_config)[1]
build_error = ""
log_hash = hashlib.sha256()
build_error = ""
if error_log_list != []:
for log_line in error_log_list:
- build_error = build_error + log_line
+ if not re.search(build_log_dict['logfilename'],
log_line):
+ build_error = build_error + log_line
log_hash.update(build_error.encode('utf-8'))
build_log_dict['build_error'] = build_error
build_log_dict['log_hash'] = log_hash.hexdigest()
- build_log_dict['logfilename'] =
settings.get("PORTAGE_LOG_FILE").split(host_config)[1]
log_msg = "Logfile name: %s" % (settings.get("PORTAGE_LOG_FILE"),)
write_log(session, log_msg, "info", config_id,
'build_log.add_buildlog_main')
build_log_dict['emerge_info'] = get_emerge_info_id(settings, trees,
session, config_id)
