| 1 |
commit: 495e43e67bbf4a013b088e0add0b36edae644d21 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 29 23:01:59 2016 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 29 23:01:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=495e43e6 |
| 7 |
|
| 8 |
fix a bug in repoman logging multiple repeat |
| 9 |
|
| 10 |
pym/tbc/build_log.py | 10 +++++----- |
| 11 |
1 file changed, 5 insertions(+), 5 deletions(-) |
| 12 |
|
| 13 |
diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py |
| 14 |
index 8b6ef0b..d053d57 100644 |
| 15 |
--- a/pym/tbc/build_log.py |
| 16 |
+++ b/pym/tbc/build_log.py |
| 17 |
@@ -41,16 +41,16 @@ def check_repoman_full(session, pkgdir, package_id, config_id, cpv=False): |
| 18 |
status = repoman_full(session, pkgdir, config_id) |
| 19 |
repoman_hash = hashlib.sha256() |
| 20 |
if cpv: |
| 21 |
- element = cpv.split('/') |
| 22 |
- pv = element[1] |
| 23 |
+ ebuild_version_tree = portage.versions.cpv_getversion(cpv) |
| 24 |
if status: |
| 25 |
repoman_dict = {} |
| 26 |
for k, v in status.items(): |
| 27 |
repoman_log2 = [] |
| 28 |
for line in v: |
| 29 |
- if not cpv: |
| 30 |
- repoman_log2.append(line) |
| 31 |
- elif cpv and re.search(pv + '.ebuild', line): |
| 32 |
+ if cpv: |
| 33 |
+ if re.search(ebuild_version_tree, line): |
| 34 |
+ repoman_log2.append(line) |
| 35 |
+ else: |
| 36 |
repoman_log2.append(line) |
| 37 |
if not repoman_log2 == []: |
| 38 |
repoman_dict[k] = repoman_log2 |
Archives