From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C8CBB13933E for ; Sat, 17 Jul 2021 08:14:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B93CE0AA5; Sat, 17 Jul 2021 08:14:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CF67E0AA5 for ; Sat, 17 Jul 2021 08:14:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEA0F33BEB9 for ; Sat, 17 Jul 2021 08:14:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 683C87BC for ; Sat, 17 Jul 2021 08:14:48 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1626509675.41b470c43fd84b66454576d1ec0d84433f0508b0.zorry@gentoo> Subject: [gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/steps/ X-VCS-Repository: proj/tinderbox-cluster X-VCS-Files: buildbot_gentoo_ci/steps/builders.py X-VCS-Directories: buildbot_gentoo_ci/steps/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 41b470c43fd84b66454576d1ec0d84433f0508b0 X-VCS-Branch: master Date: Sat, 17 Jul 2021 08:14:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 146ec672-9d0c-4e35-aae0-8f0b226bf5d4 X-Archives-Hash: 41f3790656dd05872a946abb61476394 commit: 41b470c43fd84b66454576d1ec0d84433f0508b0 Author: Magnus Granberg gentoo org> AuthorDate: Sat Jul 17 08:14:35 2021 +0000 Commit: Magnus Granberg gentoo 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 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