From beb49d4dab13fafc4efd1e3be055459117749c63 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 13 May 2021 14:45:23 +0800 Subject: [PATCH] artiq_flash: improve openocd not found error message --- artiq/frontend/artiq_flash.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py index 3342837f0..52a7972e6 100755 --- a/artiq/frontend/artiq_flash.py +++ b/artiq/frontend/artiq_flash.py @@ -75,13 +75,18 @@ Prerequisites: help="actions to perform, default: %(default)s") return parser +def which_openocd(): + openocd = shutil.which("openocd") + if not openocd: + raise FileNotFoundError("OpenOCD is required but was not found in PATH. Is it installed?") + return openocd def scripts_path(): p = ["share", "openocd", "scripts"] if os.name == "nt": p.insert(0, "Library") p = os.path.abspath(os.path.join( - os.path.dirname(os.path.realpath(shutil.which("openocd"))), + os.path.dirname(os.path.realpath(which_openocd())), "..", *p)) return p @@ -89,7 +94,7 @@ def scripts_path(): def proxy_path(): p = ["share", "bscan-spi-bitstreams"] p = os.path.abspath(os.path.join( - os.path.dirname(os.path.realpath(shutil.which("openocd"))), + os.path.dirname(os.path.realpath(which_openocd())), "..", *p)) return p