From e774b4650bd20e28a3bbc0f06f83857a47701ba0 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Tue, 3 Jul 2018 00:05:49 -0700 Subject: [PATCH] ocrmypdf.exec: trap FileNotFoundError too --- src/ocrmypdf/exec/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ocrmypdf/exec/__init__.py b/src/ocrmypdf/exec/__init__.py index f670c726..3af2b8fb 100644 --- a/src/ocrmypdf/exec/__init__.py +++ b/src/ocrmypdf/exec/__init__.py @@ -25,7 +25,7 @@ from ..exceptions import MissingDependencyError -def get_version(program, *, +def get_version(program, *, version_arg='--version', regex=r'(\d+(\.\d+)*)'): "Get the version of the specified program" args_prog = [ @@ -37,6 +37,10 @@ def get_version(program, *, args_prog, close_fds=True, universal_newlines=True, stdout=PIPE, stderr=STDOUT, check=True) output = proc.stdout + except FileNotFoundError as e: + raise MissingDependencyError( + "Could not find program '{}' on the PATH".format( + program)) from e except CalledProcessError as e: if e.returncode < 0: raise MissingDependencyError(