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 97D03158017 for ; Tue, 28 Sep 2021 22:16:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7922E0908; Tue, 28 Sep 2021 22:16:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C700E0908 for ; Tue, 28 Sep 2021 22:16:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6CD0F342FA9 for ; Tue, 28 Sep 2021 22:16:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FEEF35 for ; Tue, 28 Sep 2021 22:16:10 +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: <1632867402.c7aed08bcefcd3a3c4b4941f968416ba6d2a530e.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: c7aed08bcefcd3a3c4b4941f968416ba6d2a530e X-VCS-Branch: master Date: Tue, 28 Sep 2021 22:16:10 +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: 6fe1bf91-38bc-42ad-b4e9-8cf3122f430a X-Archives-Hash: 42fa3c5b3a06267dacdbffacde50fb6a commit: c7aed08bcefcd3a3c4b4941f968416ba6d2a530e Author: Magnus Granberg gentoo org> AuthorDate: Tue Sep 28 22:16:42 2021 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Tue Sep 28 22:16:42 2021 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=c7aed08b Fix package exclude code missing package_exclude['packages'] Signed-off-by: Magnus Granberg gentoo.org> buildbot_gentoo_ci/steps/builders.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py index 4f2b1b6..8f0aadb 100644 --- a/buildbot_gentoo_ci/steps/builders.py +++ b/buildbot_gentoo_ci/steps/builders.py @@ -458,12 +458,14 @@ class RunEmerge(BuildStep): p = yield catpkgsplit(cpv)[1] # Check if package is on the exclude list if packages_excludes != []: + print(packages_excludes) + print(cpv) for package_exclude in packages_excludes: - if '/' not in package_exclude: - if package_exclude == p: + if '/' in package_exclude['package']: + if package_exclude['package'] == c + '/' + p: return SKIPPED else: - if package_exclude == c + '/' + p: + if package_exclude['package'] == p: return SKIPPED shell_commad_list.append('-pO') # don't use bin for match