M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

artiq_flash: do not needlessly look for artifacts

This commit is contained in:
Sebastien Bourdeauducq 2019-05-07 17:20:13 +08:00
parent a1c97ec4dd
commit 3209197b0b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
artiq/frontend/artiq_flash.py
View File

@ -293,8 +293,10 @@ def main():
if bin_dir is None:
bin_dir = os.path.join(artiq_dir, "board-support")
needs_artifacts = any(action in args.action
for action in ["gateware", "bootloader", "firmware", "load"])
variant = args.variant
if variant is None:
if needs_artifacts and variant is None:
variants = []
if args.srcbuild:
for entry in os.scandir(bin_dir):
@ -317,10 +319,11 @@ def main():
else:
raise ValueError("more than one variant found for selected board, specify -V. "
"Found variants: {}".format(" ".join(sorted(variants))))
if args.srcbuild:
variant_dir = variant
else:
variant_dir = args.target + "-" + variant
if needs_artifacts:
if args.srcbuild:
variant_dir = variant
else:
variant_dir = args.target + "-" + variant
if args.host is None:
client = LocalClient()