rtems/rtems-docs
1
0
Fork 0
mirror of https://git.rtems.org/rtems-docs/ synced 2025-07-24 04:34:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix error messages when Sphinx version cannot be checked.

Browse Source 
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
This commit is contained in:
Amar Takhar 2018-12-05 14:31:53 -05:00
parent 5628d8b99a
commit a46b0250e5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/waf.py
View File

@ -119,9 +119,9 @@ def check_sphinx_version(ctx, minver):
try: try:
ver = tuple(map(int, re.split('[\D]', version))) ver = tuple(map(int, re.split('[\D]', version)))
except: except:
ctx.fatal("Sphinx version cannot be checked") ctx.fatal("Sphinx version cannot be checked or Sphinx is not installed")
except: 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: if ver < minver:
ctx.fatal("Sphinx version is too old: %s" % ".".join(map(str, ver))) ctx.fatal("Sphinx version is too old: %s" % ".".join(map(str, ver)))
return ver return ver