From 347ae4ff4733f42a439cd4efb9457e7d4e2a036b Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sat, 27 Feb 2021 13:01:34 +0900 Subject: [PATCH] Fix #8938: imgconverter: Show the error of the command availability check imgconverter extension suppresses an OSError like "Cannot allocate memory" unexpectedly. So the error should be shown with the warning. --- CHANGES | 1 + sphinx/ext/imgconverter.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 428b6951f81..50a9ce275a9 100644 --- a/CHANGES +++ b/CHANGES @@ -64,6 +64,7 @@ Features added * #2018: html: :confval:`html_favicon` and :confval:`html_logo` now accept URL for the image * #8070: html search: Support searching for 2characters word +* #8938: imgconverter: Show the error of the command availability check * #7830: Add debug logs for change detection of sources and templates * #8201: Emit a warning if toctree contains duplicated entries diff --git a/sphinx/ext/imgconverter.py b/sphinx/ext/imgconverter.py index b0d40b551ec..84fe6549c7a 100644 --- a/sphinx/ext/imgconverter.py +++ b/sphinx/ext/imgconverter.py @@ -37,10 +37,10 @@ def is_available(self) -> bool: logger.debug('Invoking %r ...', args) subprocess.run(args, stdout=PIPE, stderr=PIPE, check=True) return True - except OSError: + except OSError as exc: logger.warning(__('convert command %r cannot be run, ' - 'check the image_converter setting'), - self.config.image_converter) + 'check the image_converter setting: %s'), + self.config.image_converter, exc) return False except CalledProcessError as exc: logger.warning(__('convert exited with error:\n'