summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorAmar Takhar <verm@darkbeer.org>2018-12-05 14:31:53 -0500
committerAmar Takhar <verm@darkbeer.org>2018-12-05 14:31:53 -0500
commita46b0250e58fb8aa9032971997cc1eff8fd0dcc8 (patch)
tree031b54adccbd7c60bb2d3565b48cb6fd9e149eb8 /common
parent5628d8b99a02ecde8d9b0ad6bc84c7845423b890 (diff)
downloadrtems-docs-a46b0250e58fb8aa9032971997cc1eff8fd0dcc8.tar.bz2
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
Diffstat (limited to 'common')
-rw-r--r--common/waf.py4
1 files changed, 2 insertions, 2 deletions
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