espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 13:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ci_config_merge_newlines' into 'master'

Browse Source 
ci: Support joining sdkconfig.ci files that don't end in a newline

See merge request espressif/esp-idf!8198
This commit is contained in:
Ivan Grokhotkov
2020-04-01 16:08:02 +08:00
parent 2f0a57dece ff427c9650
commit 1ab285bebe
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/find_build_apps/cmake.py
View File

@@ -73,6 +73,8 @@ class CMakeBuildSystem(BuildSystem):
logging.debug("Appending {} to sdkconfig".format(sdkconfig_name)) logging.debug("Appending {} to sdkconfig".format(sdkconfig_name))
with open(sdkconfig_path, "r") as f_in: with open(sdkconfig_path, "r") as f_in:
for line in f_in: for line in f_in:
if not line.endswith("\n"):
line += "\n"
f_out.write(os.path.expandvars(line)) f_out.write(os.path.expandvars(line))
# Also save the sdkconfig file in the build directory # Also save the sdkconfig file in the build directory
shutil.copyfile( shutil.copyfile(