Skip to content

Commit

Permalink
build: west: Update the error message when not in west dir
Browse files Browse the repository at this point in the history
Zephyr verifies if it is built from a west-initialized directory.
The message changed in west@c08061cef1c7b0e19a58a82db731098e2f4bba4a.

Closes #18034.

Signed-off-by: Piotr Zierhoffer <pzierhoffer@antmicro.com>
Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
  • Loading branch information
PiotrZierhoffer authored and carlescufi committed Aug 6, 2019
1 parent abdd58c commit a3ddc09
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion scripts/zephyr_module.py
Expand Up @@ -130,7 +130,8 @@ def main():
out, err = p.communicate()
if p.returncode == 0:
projects = out.decode(sys.getdefaultencoding()).splitlines()
elif re.match(r'Error: .* is not in a west installation\..*',
elif re.match((r'Error: .* is not in a west installation\.'
'|FATAL ERROR: no west installation found from .*'),
err.decode(sys.getdefaultencoding())):
# Only accept the error from bootstrapper in the event we are
# outside a west managed project.
Expand Down

0 comments on commit a3ddc09

Please sign in to comment.