From a46b0250e58fb8aa9032971997cc1eff8fd0dcc8 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Wed, 5 Dec 2018 14:31:53 -0500 Subject: Fix error messages when Sphinx version cannot be checked. This is kind of a dual-check since it checks for the version while simultaneously checking to see if Sphinx exists on the system. Changed the error messages to be clear on the error and removed a reference to version which cannot be set due to the check failure. Reported by: Shashvat Jain --- common/waf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common') diff --git a/common/waf.py b/common/waf.py index 692d4de..98ce56f 100644 --- a/common/waf.py +++ b/common/waf.py @@ -119,9 +119,9 @@ def check_sphinx_version(ctx, minver): try: ver = tuple(map(int, re.split('[\D]', version))) except: - ctx.fatal("Sphinx version cannot be checked") + ctx.fatal("Sphinx version cannot be checked or Sphinx is not installed") except: - ctx.fatal("Sphinx version cannot be checked: %s" % version) + ctx.fatal("Sphinx version cannot be checked or Sphinx is not installed") if ver < minver: ctx.fatal("Sphinx version is too old: %s" % ".".join(map(str, ver))) return ver -- cgit v1.2.3