commit: 41b470c43fd84b66454576d1ec0d84433f0508b0 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> AuthorDate: Sat Jul 17 08:14:35 2021 +0000 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> CommitDate: Sat Jul 17 08:14:35 2021 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=41b470c4
Fix bug in PersOutputOfEmerge for cpv line with more then one spec Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> buildbot_gentoo_ci/steps/builders.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py index 63a1ae9..5b53018 100644 --- a/buildbot_gentoo_ci/steps/builders.py +++ b/buildbot_gentoo_ci/steps/builders.py @@ -37,8 +37,10 @@ def PersOutputOfEmerge(rc, stdout, stderr): # action [ N ] stuff subdict['action'] = line[8:15].replace(' ', '') # cpv - #FIXME: We my have more then one spece betvine ] and cpv - cpv_split = re.search('] (.+?) ', line).group(1).split(':') + # We my have more then one spece betvine ] and cpv + cpv_line = re.sub(' +', ' ', line) + # get cpv + cpv_split = re.search('] (.+?) ', cpv_line).group(1).split(':') print(cpv_split) cpv = cpv_split[0] # repository