ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tools/utils: ensure default build profiles are processed first 

The command-line argument '--profile' looks for build
profiles provided in mbed-os/tools/profiles/. If a
directory name exists in the root folder with the
same name as one of the profile names provided by
default [e.g debug/develop/release], that directory
is processed instead resulting in incorrect behavior.
Fix this behavior by processing the default profiles first.
pull/9724/head
Naveen Kaje 2019-02-14 10:17:59 -06:00
parent c07410d78c
commit 176b750257
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/utils.py
View File

@ -495,10 +495,12 @@ def argparse_profile_filestring_type(string):
absolute path or a file name (expanded to absolute path or a file name (expanded to
mbed-os/tools/profiles/<fname>.json) of a existing file""" mbed-os/tools/profiles/<fname>.json) of a existing file"""
fpath = join(dirname(__file__), "profiles/{}.json".format(string)) fpath = join(dirname(__file__), "profiles/{}.json".format(string))
if exists(string):
return string # default profiles are searched first, local ones next.
elif exists(fpath): if exists(fpath):
return fpath return fpath
elif exists(string):
return string
else: else:
raise argparse.ArgumentTypeError( raise argparse.ArgumentTypeError(
"{0} does not exist in the filesystem.".format(string)) "{0} does not exist in the filesystem.".format(string))