| 1 |
commit: d1cf1a085c322865694c738c23e655421b9364ce |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 2 23:14:54 2016 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 2 23:14:54 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=d1cf1a08 |
| 7 |
|
| 8 |
split build error from repoman/qa |
| 9 |
|
| 10 |
pym/tbc/build_log.py | 4 +--- |
| 11 |
pym/tbc/sync.py | 2 +- |
| 12 |
2 files changed, 2 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py |
| 15 |
index b194561..c70dc76 100644 |
| 16 |
--- a/pym/tbc/build_log.py |
| 17 |
+++ b/pym/tbc/build_log.py |
| 18 |
@@ -241,16 +241,14 @@ def get_buildlog_info(session, settings, pkg, build_dict, config_id): |
| 19 |
pkgdir = myportdb.getRepositoryPath(build_dict['repo']) + "/" + categories + "/" + package |
| 20 |
repoman_error_list = check_repoman_full(session, pkgdir, build_dict['package_id'], config_id, build_dict['cpv']) |
| 21 |
build_log_dict = {} |
| 22 |
+ error_search_line = "^ \\* ERROR: " |
| 23 |
build_log_dict['fail'] = False |
| 24 |
if repoman_error_list: |
| 25 |
sum_build_log_list.append(1) # repoman = 1 |
| 26 |
- build_log_dict['fail'] = True |
| 27 |
if qa_error_list != []: |
| 28 |
sum_build_log_list.append(2) # qa = 2 |
| 29 |
- build_log_dict['fail'] = True |
| 30 |
else: |
| 31 |
qa_error_list = False |
| 32 |
- error_search_line = "^ \\* ERROR: " |
| 33 |
for error_log_line in error_log_list: |
| 34 |
if re.search(error_search_line, error_log_line): |
| 35 |
build_log_dict['fail'] = True |
| 36 |
|
| 37 |
diff --git a/pym/tbc/sync.py b/pym/tbc/sync.py |
| 38 |
index 52d84ab..59560f0 100644 |
| 39 |
--- a/pym/tbc/sync.py |
| 40 |
+++ b/pym/tbc/sync.py |
| 41 |
@@ -73,7 +73,7 @@ def git_sync_main(session): |
| 42 |
# check git diffs witch get updated and pass that to a dict |
| 43 |
# fetch and merge the repo |
| 44 |
repo_cp_dict = {} |
| 45 |
- search_list = [ '^metadata', '^eclass', '^licenses', '^profiles', '^scripts', '^skel.ebuild',] |
| 46 |
+ search_list = [ '^metadata', '^eclass', '^licenses', '^profiles', '^scripts', '^skel.', ] |
| 47 |
for repo_dir in git_repos_list(myportdb): |
| 48 |
reponame = myportdb.getRepositoryName(repo_dir) |
| 49 |
repo = git.Repo(repo_dir) |
Archives