Merge pull request sphinx-doc#8939 from tk0miya/8938_imgconverter_sho…

…w_OSError Fix sphinx-doc#8938: imgconverter: Show the error of the command availability check
tk0miya · Feb 28, 2021 · 6ca7c1c · 6ca7c1c
2 parents 2c98789 + 347ae4f
commit 6ca7c1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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'