Merge branch 'bugfix/ci_config_merge_newlines' into 'master'

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

View File

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