Skip to content

Commit 403b81d

Browse files
authored
chef: fix unterminated string literal in chef.py script (project-chip#41786)
1 parent fd84b7d commit 403b81d

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

examples/chef/chef.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ def load_config() -> None:
9191
config["nrfconnect"]["TTY"] = None
9292
config["esp32"]["IDF_PATH"] = os.environ.get('IDF_PATH')
9393
config["esp32"]["TTY"] = None
94-
config["silabs-thread"]["GECKO_SDK"] = f"{
95-
_REPO_BASE_PATH}third_party/efr32_sdk/repo"
94+
config["silabs-thread"]["GECKO_SDK"] = f"{_REPO_BASE_PATH}third_party/efr32_sdk/repo"
9695
config["silabs-thread"]["TTY"] = None
9796
config["silabs-thread"]["CU"] = None
9897
config["silabs-thread"]["SILABS_BOARD"] = None
@@ -431,8 +430,7 @@ def main() -> int:
431430
f"{device_name} in CICD config but not {_DEVICE_FOLDER}!")
432431
exit(1)
433432
shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}")
434-
command = f"./chef.py -cbr -d {
435-
device_name} -t {options.build_target}"
433+
command = f"./chef.py -cbr -d {device_name} -t {options.build_target}"
436434
flush_print(f"Building {command}", with_border=True)
437435
shell.run_cmd(command)
438436
bundle(options.build_target, device_name)
@@ -717,8 +715,7 @@ def main() -> int:
717715
if len(sw_ver_string) >= 64:
718716
truncated_sw_ver_string = f"""{branch[:22]}:{commit_id}"""
719717
flush_print(
720-
f"Truncate the software version string from \"{
721-
sw_ver_string}\" to "
718+
f"Truncate the software version string from \"{sw_ver_string}\" to "
722719
f"\"{truncated_sw_ver_string}\" due to 64 bytes limitation")
723720
sw_ver_string = truncated_sw_ver_string
724721

@@ -763,8 +760,7 @@ def main() -> int:
763760
shell.run_cmd("idf.py build")
764761
shell.run_cmd("idf.py build flashing_script")
765762
shell.run_cmd(
766-
f"(cd build/ && tar cJvf $(git rev-parse HEAD)-{
767-
options.sample_device_type_name}.tar.xz "
763+
f"(cd build/ && tar cJvf $(git rev-parse HEAD)-{options.sample_device_type_name}.tar.xz "
768764
f"--files-from=chip-shell.flashbundle.txt)")
769765
shell.run_cmd(
770766
f"cp build/$(git rev-parse HEAD)-{options.sample_device_type_name}.tar.xz {_CHEF_SCRIPT_PATH}")
@@ -850,8 +846,7 @@ def main() -> int:
850846
shell.run_cmd(
851847
f"cd {config['ameba']['AMEBA_SDK']}/project/realtek_amebaz2_v0_example/GCC-RELEASE")
852848
shell.run_cmd("rm -f project_include.mk")
853-
cmd = f"{config['ameba']['AMEBA_SDK']
854-
}/project/realtek_amebaz2_v0_example/GCC-RELEASE/project_include.mk"
849+
cmd = f"{config['ameba']['AMEBA_SDK']}/project/realtek_amebaz2_v0_example/GCC-RELEASE/project_include.mk"
855850
with open(cmd, "w") as f:
856851
f.write(textwrap.dedent(f"""\
857852
SAMPLE_NAME = {options.sample_device_type_name}
@@ -1014,8 +1009,7 @@ def main() -> int:
10141009
shell.run_cmd(
10151010
f"cd {config['ameba']['AMEBA_SDK']}/tools/AmebaD/Image_Tool_Linux")
10161011
shell.run_cmd((
1017-
f"{config['ameba']['AMEBA_SDK']
1018-
}/tools/AmebaD/Image_Tool_Linux/flash.sh "
1012+
f"{config['ameba']['AMEBA_SDK']}/tools/AmebaD/Image_Tool_Linux/flash.sh "
10191013
f"{config['ameba']['TTY']} {config['ameba']['AMEBA_SDK']}"
10201014
f"/project/realtek_amebaD_va0_example/GCC-RELEASE/out"
10211015
), raise_on_returncode=False)
@@ -1024,8 +1018,7 @@ def main() -> int:
10241018
shell.run_cmd(
10251019
f"cd {config['ameba']['AMEBA_SDK']}/tools/AmebaZ2/Image_Tool_Linux")
10261020
shell.run_cmd((
1027-
f"{config['ameba']['AMEBA_SDK']
1028-
}/tools/AmebaZ2/Image_Tool_Linux/flash.sh "
1021+
f"{config['ameba']['AMEBA_SDK']}/tools/AmebaZ2/Image_Tool_Linux/flash.sh "
10291022
f"{config['ameba']['TTY']} {config['ameba']['AMEBA_SDK']}"
10301023
f"/project/realtek_amebaz2_v0_example/GCC-RELEASE/application_is/Debug/bin"
10311024
), raise_on_returncode=False)

0 commit comments

Comments
 (0)