Merge branch 'bugfix/menuconfig_argv_encoding' into 'master'

menuconfig: fix the MENUCONFIG_STYLE encoding issue and CLI env issue

See merge request espressif/esp-idf!6910
pull/4494/head
Angus Gratton 2019-12-11 12:47:32 +08:00
commit f78b2158b1
2 zmienionych plików z 4 dodań i 2 usunięć

Wyświetl plik

@ -679,7 +679,7 @@ def init_cli(verbose_output=None):
def main():
checks_output = check_environment()
cli = init_cli(verbose_output=checks_output)
cli(prog_name=PROG)
cli(sys.argv[1:], prog_name=PROG)
def _valid_unicode_config():

Wyświetl plik

@ -35,7 +35,9 @@ def action_extensions(base_actions, project_path):
Menuconfig target is build_target extended with the style argument for setting the value for the environment
variable.
"""
os.environ['MENUCONFIG_STYLE'] = style
# The subprocess lib cannot accept environment variables as "unicode" . This is a problem
# only in Python 2.
os.environ['MENUCONFIG_STYLE'] = style.encode(sys.getfilesystemencoding() or 'utf-8')
build_target(target_name, ctx, args)
def fallback_target(target_name, ctx, args):