Changeset 0f5ccd4 in rtems-docs


Ignore:
Timestamp:
Jan 23, 2016, 5:01:45 AM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.11, master
Children:
b8d3f6b
Parents:
e5afcaa
git-author:
Chris Johns <chrisj@…> (01/23/16 05:01:45)
git-committer:
Amar Takhar <verm@…> (05/03/16 00:51:25)
Message:

Generate a fatal error on a Sphinx beta version that cannot be parsed.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • common/waf.py

    re5afcaa r0f5ccd4  
    5252
    5353def check_sphinx_version(ctx, minver):
    54         version = ctx.cmd_and_log(ctx.env.BIN_SPHINX_BUILD + ['--version']).split(" ")[-1:][0]
    55         ver = tuple(map(int, version.split(".")))
    56 
     54        version = ctx.cmd_and_log(ctx.env.BIN_SPHINX_BUILD + ['--version']).split(" ")[-1:][0].strip()
     55        try:
     56                ver = tuple(map(int, version.split(".")))
     57        except:
     58                ctx.fatal("Sphinx version cannot be checked: %s" % version)
    5759        if ver < minver:
    5860                ctx.fatal("Sphinx version is too old: %s" % ".".join(map(str, ver)))
Note: See TracChangeset for help on using the changeset viewer.