Skip to content

Commit 0b80a1d

Browse files
committed
autogen.pl: ignore all excluded components
If multiple components in a framework were excluded, then only the first one in the list was being checked - which means that only the first one in the list was actually being excluded. All others were missed by the current code. This change actually searches the entire list of excluded components to see if the one we found matches any of the list members. Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent 5e42613 commit 0b80a1d

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

autogen.pl

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Copyright (c) 2013 Mellanox Technologies, Inc.
66
# All rights reserved.
77
# Copyright (c) 2013-2020 Intel, Inc. All rights reserved.
8-
# Copyright (c) 2015-2020 Research Organization for Information Science
8+
# Copyright (c) 2015-2021 Research Organization for Information Science
99
# and Technology (RIST). All rights reserved.
1010
# Copyright (c) 2015-2021 IBM Corporation. All rights reserved.
1111
# Copyright (c) 2020 Amazon.com, Inc. or its affiliates.
@@ -348,10 +348,18 @@ sub mca_process_framework {
348348
verbose "--- Found $pname / $framework / $d component\n";
349349

350350
# Skip if specifically excluded
351-
if (exists($exclude_list->{$framework}) &&
352-
$exclude_list->{$framework}[0] eq $d) {
353-
verbose " => Excluded\n";
354-
next;
351+
if (exists($exclude_list->{$framework})) {
352+
my $tst = 0;
353+
foreach my $ck (@{$exclude_list->{$framework}}) {
354+
if ($ck eq $d) {
355+
verbose " => Excluded\n";
356+
$tst = 1;
357+
last;
358+
}
359+
}
360+
if ($tst) {
361+
next;
362+
}
355363
}
356364

357365
# Skip if the framework is on the include list, but

0 commit comments

Comments
 (0)