commit:     495e43e67bbf4a013b088e0add0b36edae644d21
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 23:01:59 2016 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 23:01:59 2016 +0000
URL:        
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=495e43e6

fix a bug in repoman logging multiple repeat

 pym/tbc/build_log.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py
index 8b6ef0b..d053d57 100644
--- a/pym/tbc/build_log.py
+++ b/pym/tbc/build_log.py
@@ -41,16 +41,16 @@ def check_repoman_full(session, pkgdir, package_id, 
config_id, cpv=False):
        status = repoman_full(session, pkgdir, config_id)
        repoman_hash = hashlib.sha256()
        if cpv:
-               element = cpv.split('/')
-               pv = element[1]
+               ebuild_version_tree = portage.versions.cpv_getversion(cpv)
        if status:
                repoman_dict = {}
                for k, v in status.items():
                        repoman_log2 = []
                        for line in v:
-                               if not cpv:
-                                       repoman_log2.append(line)
-                               elif cpv and re.search(pv + '.ebuild', line):
+                               if cpv:
+                                       if re.search(ebuild_version_tree, line):
+                                               repoman_log2.append(line)
+                               else: 
                                        repoman_log2.append(line)
                        if not repoman_log2 == []:
                                repoman_dict[k] = repoman_log2

Reply via email to