commit: bef60d0e1f8aa0a01196b41071f82026d3e27fb0 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> AuthorDate: Fri Aug 7 14:04:39 2015 +0000 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> CommitDate: Fri Aug 7 14:04:39 2015 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=bef60d0e
small fixes for repoman pym/tbc/build_log.py | 4 ++-- pym/tbc/package.py | 1 + pym/tbc/repoman/utilities.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py index d72ef91..bbe35d4 100644 --- a/pym/tbc/build_log.py +++ b/pym/tbc/build_log.py @@ -197,7 +197,7 @@ def search_buildlog(session, logfile_text_dict, max_text_lines): new_hilight_dict[adict3['startline']] = adict3 return new_hilight_dict -def get_buildlog_info(session, settings, pkg, build_dict): +def get_buildlog_info(session, settings, pkg, build_dict, config_id): myportdb = portage.portdbapi(mysettings=settings) logfile_text_dict, max_text_lines = get_log_text_dict(settings.get("PORTAGE_LOG_FILE")) hilight_dict = search_buildlog(session, logfile_text_dict, max_text_lines) @@ -275,7 +275,7 @@ def add_buildlog_main(settings, pkg, trees): session.close return build_log_dict = {} - build_log_dict = get_buildlog_info(session, settings, pkg, build_dict) + build_log_dict = get_buildlog_info(session, settings, pkg, build_dict, config_id) error_log_list = build_log_dict['error_log_list'] build_error = "" log_hash = hashlib.sha256() diff --git a/pym/tbc/package.py b/pym/tbc/package.py index 0bb41eb..980b089 100644 --- a/pym/tbc/package.py +++ b/pym/tbc/package.py @@ -4,6 +4,7 @@ from __future__ import print_function import re import hashlib +import os import portage from portage.xml.metadata import MetaDataXML from tbc.flags import tbc_use_flags diff --git a/pym/tbc/repoman/utilities.py b/pym/tbc/repoman/utilities.py index b1871db..b6ed825 100644 --- a/pym/tbc/repoman/utilities.py +++ b/pym/tbc/repoman/utilities.py @@ -240,7 +240,7 @@ def get_commit_message_with_stdin(): return commitmessage -def FindPortdir(settings, pkdir): +def FindPortdir(settings, pkgdir): """ Try to figure out what repo we are in and whether we are in a regular tree or an overlay. @@ -276,7 +276,7 @@ def FindPortdir(settings, pkdir): # the current working directory (from the shell). location = pwd - if not pkdir is None: + if not pkgdir is None: location = pkgdir location = normalize_path(location)