Skip to content

Commit b7c71e0

Browse files
committed
fix validation order
1 parent 7cf0e9c commit b7c71e0

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

dev/tasks/crossbow.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -387,19 +387,18 @@ def load_tasks_from_config(config_path, task_names, group_names):
387387
with Path(config_path).open() as fp:
388388
config = yaml.load(fp)
389389

390-
valid_tasks = set(config['tasks'].keys())
391390
valid_groups = set(config['groups'].keys())
392-
393391
requested_groups = set(group_names)
394-
requested_tasks = set(
395-
sum([config['groups'][g] for g in group_names], list(task_names))
396-
)
397392
invalid_groups = requested_groups - valid_groups
398-
invalid_tasks = requested_tasks - valid_tasks
399-
400393
if invalid_groups:
401394
raise click.ClickException('Invalid group(s) {!r}. Must be one of {!r}'
402395
.format(invalid_groups, valid_groups))
396+
397+
valid_tasks = set(config['tasks'].keys())
398+
requested_tasks = set(
399+
sum([config['groups'][g] for g in group_names], list(task_names))
400+
)
401+
invalid_tasks = requested_tasks - valid_tasks
403402
if invalid_tasks:
404403
raise click.ClickException('Invalid task(s) {!r}. Must be one of {!r}'
405404
.format(invalid_tasks, valid_tasks))

0 commit comments

Comments
 (0)