Order of operations suppressed detailed Ghostscript missing error message

This commit is contained in:
James R. Barlow
2021-12-18 01:27:39 -08:00
parent f8fadaef41
commit 7035002c03
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -18,13 +18,13 @@ log = logging.getLogger(__name__)
@hookimpl
def check_options(options):
gs_version = ghostscript.version()
check_external_program(
program='gs',
package='ghostscript',
version_checker=gs_version,
version_checker=ghostscript.version,
need_version='9.15', # limited by Travis CI / Ubuntu 14.04 backports
)
gs_version = ghostscript.version()
if gs_version in ('9.24', '9.51'):
raise MissingDependencyError(
f"Ghostscript {gs_version} contains serious regressions and is not "
+2 -2
View File
@@ -266,7 +266,7 @@ def check_external_program(
*,
program: str,
package: str,
version_checker: Union[str, Callable],
version_checker: Callable,
need_version: str,
required_for: Optional[str] = None,
recommended=False,
@@ -291,7 +291,7 @@ def check_external_program(
try:
if callable(version_checker):
found_version = version_checker()
else:
else: # deprecated
found_version = version_checker
except (CalledProcessError, FileNotFoundError, MissingDependencyError):
_error_missing_program(program, package, required_for, recommended)