blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/tools_click_envvar' into 'master'

Browse Source 
Tools: Improve idf.py error message when the argument value collides with the environment variable

Closes IDFGH-9072

See merge request espressif/esp-idf!21884
This commit is contained in:
Roland Dobai 2023-01-04 02:26:56 +08:00
commit 73366d9dea
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/idf.py
View File

@ -527,9 +527,14 @@ def init_cli(verbose_output: List=None) -> Any:
default = () if option.multiple else option.default
if global_value != default and local_value != default and global_value != local_value:
raise FatalError(
'Option "%s" provided for "%s" is already defined to a different value. '
'This option can appear at most once in the command line.' % (key, task.name))
if hasattr(option, 'envvar') and option.envvar and os.getenv(option.envvar) != default:
msg = (f'This option cannot be set in command line if the {option.envvar} '
'environment variable is set to a different value.')
else:
msg = 'This option can appear at most once in the command line.'
raise FatalError(f'Option "{key}" provided for "{task.name}" is already defined to '
f'a different value. {msg}')
if local_value != default:
global_args[key] = local_value