Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/sphinx-doc/sphinx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2021-02-28 06:57:32 +0300
committerGitHub <noreply@github.com>2021-02-28 06:57:32 +0300
commit6ca7c1c579c6857985a5e8faae64a77b32dc6098 (patch)
tree2cf04e79f4ea786a290b123dbd5abbc001339cdf /sphinx/ext
parent2c987897eb7e43df05455968ac8be9860c8d5af3 (diff)
parent347ae4ff4733f42a439cd4efb9457e7d4e2a036b (diff)
Merge pull request #8939 from tk0miya/8938_imgconverter_show_OSError
Fix #8938: imgconverter: Show the error of the command availability check
Diffstat (limited to 'sphinx/ext')
-rw-r--r--sphinx/ext/imgconverter.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/ext/imgconverter.py b/sphinx/ext/imgconverter.py
index b0d40b551..84fe6549c 100644
--- a/sphinx/ext/imgconverter.py
+++ b/sphinx/ext/imgconverter.py
@@ -37,10 +37,10 @@ class ImagemagickConverter(ImageConverter):
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'