mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

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

Closes https://github.com/espressif/esp-idf/issues/10475
pull/10984/head
Roland Dobai 2023-01-03 18:03:51 +01:00
rodzic 9ee3c8337d
commit 1bac78fbc3
1 zmienionych plików z 8 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
tools/idf.py
Wyświetl plik

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