Address review comments and test failures

This commit is contained in:
Pedro Algarvio
2018-12-26 08:56:30 +00:00
parent afbc57f2ad
commit 5840f880a9
2 changed files with 11 additions and 7 deletions

View File

@@ -257,17 +257,20 @@ def run(config_file, store, args, environ=os.environ):
for repo in repositories(config, store):
for _, hook in repo.hooks:
if (
(not args.hook or hook['id'] == args.hook or (
hook['alias'] and hook['alias'] == args.hook
)) and
(not hook['stages'] or args.hook_stage in hook['stages'])
(
not args.hook or
hook['id'] == args.hook or
hook['alias'] == args.hook
) and
(
not hook['stages'] or
args.hook_stage in hook['stages']
)
):
repo_hooks.append((repo, hook))
if args.hook and not repo_hooks:
output.write_line(
'No hook with id or alias `{}`'.format(args.hook),
)
output.write_line('No hook with id `{}`'.format(args.hook))
return 1
for repo in {repo for repo, _ in repo_hooks}:

View File

@@ -831,6 +831,7 @@ def test_manifest_hooks(tempdir_factory, store):
'exclude': '^$',
'files': '',
'id': 'bash_hook',
'alias': '',
'language': 'script',
'language_version': 'default',
'log_file': '',