commit: 250f837e65c6e28381ca57ecbe97085974902bdf
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 20:28:04 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 20:28:04 2016 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=250f837e
move the hash for the build log
pym/tbc/build_log.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py
index 79dbe2a..7b3784a 100644
--- a/pym/tbc/build_log.py
+++ b/pym/tbc/build_log.py
@@ -28,7 +28,7 @@ from tbc.ConnectionManager import NewConnection
from tbc.sqlquerys import add_logs, get_config_id, get_ebuild_id_db,
add_new_buildlog, \
get_package_info, get_build_job_id, get_use_id, get_config_info,
get_hilight_info, get_error_info_list, \
add_e_info, get_fail_times, add_fail_times, update_fail_times,
del_old_build_jobs, add_old_ebuild, \
- update_buildjobs_status, update_manifest_sql, add_repoman_qa,
get_config_id_fqdn, get_setup_info, \
+ update_buildjobs_status, update_mtime_sql, add_repoman_qa,
get_config_id_fqdn, get_setup_info, \
add_repoman_log
from sqlalchemy.orm import sessionmaker
@@ -107,7 +107,7 @@ def get_build_dict_db(session, config_id, settings,
tbc_settings_dict, pkg):
if ebuild_id_list is None:
log_msg = "%s:%s Don't have any ebuild_id!" % (pkg.cpv,
repo,)
add_logs(session, log_msg, "info", config_id)
- update_manifest_sql(session, build_dict['package_id'],
"0")
+ update_mtime_sql(session, build_dict['package_id'], 0)
else:
old_ebuild_id_list = []
for ebuild_id in ebuild_id_list:
@@ -293,7 +293,7 @@ def add_buildlog_main(settings, pkg, trees):
if error_log_list != []:
for log_line in error_log_list:
build_error = build_error + log_line
- log_hash.update(log_line.encode('utf-8'))
+ 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]
@@ -322,7 +322,7 @@ def add_buildlog_main(settings, pkg, trees):
qa_msg = "QA: FAILD"
else:
build_msg = "BUILD: FAILD"
- msg = "Package: %s Repo: %s %s %s %s Weblink
http://foo.gg.oo/buildpackage/%s\n"; % (pkg.cpv, pkg.repo, build_msg,
repoman_msg, qa_msg, log_id,)
+ msg = "Package: %s Repo: %s %s %s %s Weblink
http://foo.gg.oo/new/logs/build/%s\n"; % (pkg.cpv, pkg.repo, build_msg,
repoman_msg, qa_msg, log_id,)
send_irk(msg)
session.close
