From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 73D1958973 for ; Mon, 18 Jan 2016 20:26:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA8B621C016; Mon, 18 Jan 2016 20:26:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D56E21C016 for ; Mon, 18 Jan 2016 20:26:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D0973408A2 for ; Mon, 18 Jan 2016 20:26:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99C34A91 for ; Mon, 18 Jan 2016 20:26:44 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1453148884.250f837e65c6e28381ca57ecbe97085974902bdf.zorry@gentoo> Subject: [gentoo-commits] proj/tinderbox-cluster:master commit in: pym/tbc/ X-VCS-Repository: proj/tinderbox-cluster X-VCS-Files: pym/tbc/build_log.py X-VCS-Directories: pym/tbc/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 250f837e65c6e28381ca57ecbe97085974902bdf X-VCS-Branch: master Date: Mon, 18 Jan 2016 20:26:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 03b28d93-1fca-490e-a423-a27b18a70157 X-Archives-Hash: c42237104052d9a6165711d044cf960d commit: 250f837e65c6e28381ca57ecbe97085974902bdf Author: Magnus Granberg gentoo org> AuthorDate: Mon Jan 18 20:28:04 2016 +0000 Commit: Magnus Granberg gentoo 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