File tree Expand file tree Collapse file tree 1 file changed +2
-5
lines changed
mesonbuild/modules/features Expand file tree Collapse file tree 1 file changed +2
-5
lines changed Original file line number Diff line number Diff line change @@ -371,15 +371,12 @@ def fail_result(fail_reason: str, is_disabled: bool = False
371
371
values : List [ConflictAttr ] = getattr (fet , attr )
372
372
accumulate_values = test_result [attr ] # type: ignore
373
373
for conflict in values :
374
- if not conflict .match :
375
- accumulate_values .append (conflict .val )
376
- continue
377
374
conflict_vals : List [str ] = []
378
375
# select the acc items based on the match
379
376
new_acc : List [str ] = []
380
377
for acc in accumulate_values :
381
378
# not affected by the match so we keep it
382
- if not conflict .match .match (acc ):
379
+ if not ( conflict .match and conflict .match . match (acc ) ):
383
380
new_acc .append (acc )
384
381
continue
385
382
# no filter so we totaly escape it
@@ -396,7 +393,7 @@ def fail_result(fail_reason: str, is_disabled: bool = False
396
393
continue
397
394
conflict_vals .append (conflict .mjoin .join (filter_val ))
398
395
new_acc .append (conflict .val + conflict .mjoin .join (conflict_vals ))
399
- test_result [attr ] = new_acc # type: ignore
396
+ accumulate_values = test_result [attr ] = new_acc # type: ignore
400
397
401
398
test_args = compiler .has_multi_arguments
402
399
args = test_result ['args' ]
You can’t perform that action at this time.
0 commit comments