commit: d1cf1a085c322865694c738c23e655421b9364ce
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 2 23:14:54 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 23:14:54 2016 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=d1cf1a08
split build error from repoman/qa
pym/tbc/build_log.py | 4 +---
pym/tbc/sync.py | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py
index b194561..c70dc76 100644
--- a/pym/tbc/build_log.py
+++ b/pym/tbc/build_log.py
@@ -241,16 +241,14 @@ def get_buildlog_info(session, settings, pkg, build_dict,
config_id):
pkgdir = myportdb.getRepositoryPath(build_dict['repo']) + "/" +
categories + "/" + package
repoman_error_list = check_repoman_full(session, pkgdir,
build_dict['package_id'], config_id, build_dict['cpv'])
build_log_dict = {}
+ error_search_line = "^ \\* ERROR: "
build_log_dict['fail'] = False
if repoman_error_list:
sum_build_log_list.append(1) # repoman = 1
- build_log_dict['fail'] = True
if qa_error_list != []:
sum_build_log_list.append(2) # qa = 2
- build_log_dict['fail'] = True
else:
qa_error_list = False
- error_search_line = "^ \\* ERROR: "
for error_log_line in error_log_list:
if re.search(error_search_line, error_log_line):
build_log_dict['fail'] = True
diff --git a/pym/tbc/sync.py b/pym/tbc/sync.py
index 52d84ab..59560f0 100644
--- a/pym/tbc/sync.py
+++ b/pym/tbc/sync.py
@@ -73,7 +73,7 @@ def git_sync_main(session):
# check git diffs witch get updated and pass that to a dict
# fetch and merge the repo
repo_cp_dict = {}
- search_list = [ '^metadata', '^eclass', '^licenses', '^profiles',
'^scripts', '^skel.ebuild',]
+ search_list = [ '^metadata', '^eclass', '^licenses', '^profiles',
'^scripts', '^skel.', ]
for repo_dir in git_repos_list(myportdb):
reponame = myportdb.getRepositoryName(repo_dir)
repo = git.Repo(repo_dir)
