mirror/OCRmyPDF
1
0
Fork 0
mirror of https://github.com/ocrmypdf/OCRmyPDF.git synced 2026-05-06 21:56:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

main: fix version testing unnecessarily throwing exception to itself

Browse Source
This commit is contained in:
James R. Barlow
2019-03-05 22:32:06 -08:00
parent f7da63f68b
commit 902bda43e3
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ocrmypdf/__main__.py
View File

@@ -604,29 +604,33 @@ def check_options_sidecar(options, log):
def _optional_program_required(name, version_fn, min_version, for_argument):
try:
if version_fn() < min_version:
raise MissingDependencyError(
f"The installed '{name}' is not supported. "
f"Install version {min_version} or newer."
)
version = version_fn()
except (FileNotFoundError, MissingDependencyError):
raise MissingDependencyError(
f"Install the '{name}' program to use {for_argument}."
)
def _optional_program_recommended(name, version_fn, min_version, for_argument):
try:
if version_fn() < min_version:
else:
if version < min_version:
raise MissingDependencyError(
f"The installed '{name}' is not supported. "
f"Install version {min_version} or newer."
)
def _optional_program_recommended(name, version_fn, min_version, for_argument):
try:
version = version_fn()
except (FileNotFoundError, MissingDependencyError):
complain(
f"For best results, install the optional program '{name}' to use the "
f"argument {for_argument}."
)
else:
if version < min_version:
raise MissingDependencyError(
f"The installed '{name}' is not supported. "
f"Install version {min_version} or newer."
)
def check_options_preprocessing(options, log):