Skip to content

Commit 43b112a

Browse files
pdgendtkartben
authored andcommitted
scripts: west_commands: runners: Fix jlink unbound cmd
Commit e2a32d8 introduced an unbound cmd issue for jlink flashing. Fixed by moving cmd assignment outside of condition. Signed-off-by: Pieter De Gendt <[email protected]>
1 parent f90ce01 commit 43b112a

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

scripts/west_commands/runners/jlink.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -414,21 +414,22 @@ def run_flash_cmd(self, fname, flash_file, **kwargs):
414414
loader_details = ""
415415
if self.supports_loader and self.loader:
416416
loader_details = "?" + self.loader
417-
cmd = (
418-
[self.commander]
419-
+ (
420-
['-IP', f'{self.dev_id}']
421-
if (is_ip(self.dev_id) or is_tunnel(self.dev_id))
422-
else (['-USB', f'{self.dev_id}'] if self.dev_id else [])
423-
)
424-
+ (['-nogui', '1'] if self.supports_nogui else [])
425-
+ ['-if', self.iface]
426-
+ ['-speed', self.speed]
427-
+ ['-device', self.device + loader_details]
428-
+ ['-CommanderScript', fname]
429-
+ (['-nogui', '1'] if self.supports_nogui else [])
430-
+ self.tool_opt
417+
418+
cmd = (
419+
[self.commander]
420+
+ (
421+
['-IP', f'{self.dev_id}']
422+
if (is_ip(self.dev_id) or is_tunnel(self.dev_id))
423+
else (['-USB', f'{self.dev_id}'] if self.dev_id else [])
431424
)
425+
+ (['-nogui', '1'] if self.supports_nogui else [])
426+
+ ['-if', self.iface]
427+
+ ['-speed', self.speed]
428+
+ ['-device', self.device + loader_details]
429+
+ ['-CommanderScript', fname]
430+
+ (['-nogui', '1'] if self.supports_nogui else [])
431+
+ self.tool_opt
432+
)
432433

433434
if flash_file:
434435
self.logger.info(f'Flashing file: {flash_file}')

0 commit comments

Comments
 (0)