commit: c7aed08bcefcd3a3c4b4941f968416ba6d2a530e
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 28 22:16:42 2021 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> 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 <zorry <AT> 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
