OrgZephyr/west
OrgZephyr
/
west
mirror of https://github.com/zephyrproject-rtos/west.git
1
0
Fork 0
Code Issues Releases Wiki Activity

main: improve ZEPHYR_BASE mismatch check 

Fixes: #239
Signed-off-by: Marti Bolivar <marti@foundries.io>
This commit is contained in:
Marti Bolivar 2019-03-27 15:33:51 -06:00 committed by Carles Cufí
parent 20d1773439
commit 619d64032a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/west/main.py
View File

@ -402,8 +402,14 @@ def set_zephyr_base(args):
elif zb_env is not None: elif zb_env is not None:
zb = zb_env zb = zb_env
zb_origin = 'env' zb_origin = 'env'
if zb_config is not None and \ try:
os.path.abspath(zb_config) != os.path.abspath(zb_env): different = (zb_config is not None and
not os.path.samefile(zb_config, zb_env))
except FileNotFoundError:
different = (zb_config is not None and
(os.path.normpath(os.path.abspath(zb_config)) !=
os.path.normpath(os.path.abspath(zb_env))))
if different:
# The environment ZEPHYR_BASE takes precedence over the config # The environment ZEPHYR_BASE takes precedence over the config
# setting, but in normal multi-repo operation we shouldn't # setting, but in normal multi-repo operation we shouldn't
# expect to need to set ZEPHYR_BASE. # expect to need to set ZEPHYR_BASE.