Skip to content

Commit 35f75aa

Browse files
committed
yosys: use a list of args, instead of an string, for calling yosys
1 parent f77a9ec commit 35f75aa

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

sphinxcontrib_hdl_diagrams/__init__.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,11 @@ def run_yosys(src, cmd, yosys='yowasp'):
243243
ycmd = ["-q", "-p", "{}".format(cmd), src]
244244
print("Running YoWASP yosys: {}".format(ycmd))
245245
yowasp_yosys.run_yosys(ycmd)
246-
elif yosys == 'system':
247-
ycmd = "yosys -p '{cmd}' {src}".format(src=src, cmd=cmd)
248-
print("Running yosys: {}".format(ycmd))
249-
subprocess.check_output(ycmd, shell=True)
250-
else:
251-
ycmd = "{yosys} -p '{cmd}' {src}".format(yosys=yosys, src=src, cmd=cmd)
252-
print("Running yosys: {}".format(ycmd))
253-
subprocess.check_output(ycmd, shell=True)
246+
return
247+
248+
ycmd = [f"{'yosys' if yosys == 'system' else yosys}", '-p', f"{cmd}", f"{src}"]
249+
print(f"Running yosys: {ycmd}")
250+
subprocess.check_output(ycmd, shell=True)
254251

255252

256253
def diagram_yosys(ipath, opath, module='top', flatten=False,

0 commit comments

Comments
 (0)