diff options
| author | Chris Johns <chrisj@rtems.org> | 2016-01-23 16:01:45 +1100 |
|---|---|---|
| committer | Amar Takhar <verm@darkbeer.org> | 2016-05-02 20:51:25 -0400 |
| commit | 0f5ccd4d6d63e622f4e43ca516e6f5df3f0a3150 (patch) | |
| tree | d610545bbf6de9f76810033c70a1feabf4b86729 /common/waf.py | |
| parent | Add OAR copyright to each file. (diff) | |
| download | rtems-docs-0f5ccd4d6d63e622f4e43ca516e6f5df3f0a3150.tar.bz2 | |
Generate a fatal error on a Sphinx beta version that cannot be parsed.
Diffstat (limited to '')
| -rw-r--r-- | common/waf.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/common/waf.py b/common/waf.py index faf7ed5..cf73ddc 100644 --- a/common/waf.py +++ b/common/waf.py @@ -51,9 +51,11 @@ class linkcheck(BuildContext): def check_sphinx_version(ctx, minver): - version = ctx.cmd_and_log(ctx.env.BIN_SPHINX_BUILD + ['--version']).split(" ")[-1:][0] - ver = tuple(map(int, version.split("."))) - + version = ctx.cmd_and_log(ctx.env.BIN_SPHINX_BUILD + ['--version']).split(" ")[-1:][0].strip() + try: + ver = tuple(map(int, version.split("."))) + except: + ctx.fatal("Sphinx version cannot be checked: %s" % version) if ver < minver: ctx.fatal("Sphinx version is too old: %s" % ".".join(map(str, ver))) |