Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

confserver: Fix NamedTemporaryFile use on Windows

Browse source 
Can't have the file open twice, so need to close and delete after reopening.
This commit is contained in:
Angus Gratton 2019-08-16 19:24:20 +10:00 committed by Angus Gratton
parent a8e8919bbf
commit 79afd2d580
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/kconfig_new/confserver.py
View file

@ -74,12 +74,14 @@ def run_server(kconfig, sdkconfig, sdkconfig_rename, default_version=MAX_PROTOCO
sdkconfig_renames = [sdkconfig_rename] if sdkconfig_rename else [] sdkconfig_renames = [sdkconfig_rename] if sdkconfig_rename else []
sdkconfig_renames += os.environ.get("COMPONENT_SDKCONFIG_RENAMES", "").split() sdkconfig_renames += os.environ.get("COMPONENT_SDKCONFIG_RENAMES", "").split()
deprecated_options = confgen.DeprecatedOptions(config.config_prefix, path_rename_files=sdkconfig_renames) deprecated_options = confgen.DeprecatedOptions(config.config_prefix, path_rename_files=sdkconfig_renames)
with tempfile.NamedTemporaryFile(mode='w+b') as f_o: f_o = tempfile.NamedTemporaryFile(mode='w+b', delete=False)
try:
with open(sdkconfig, mode='rb') as f_i: with open(sdkconfig, mode='rb') as f_i:
f_o.write(f_i.read()) f_o.write(f_i.read())
f_o.flush() f_o.close() # need to close as DeprecatedOptions will reopen, and Windows only allows one open file
f_o.seek(0)
deprecated_options.replace(sdkconfig_in=f_o.name, sdkconfig_out=sdkconfig) deprecated_options.replace(sdkconfig_in=f_o.name, sdkconfig_out=sdkconfig)
finally:
os.unlink(f_o.name)
config.load_config(sdkconfig) config.load_config(sdkconfig)
print("Server running, waiting for requests on stdin...", file=sys.stderr) print("Server running, waiting for requests on stdin...", file=sys.stderr)