diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-10-31 13:10:58 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-10-31 13:10:58 -0700 |
| commit | 90dcac551fee69cf284ae4431db949bc69796a1c (patch) | |
| tree | a15ccaaac95e1ae60527d7edbe8ff5857ee0a77a /tools | |
| parent | 92f9f71cba2781b72cf25a9c6e9dcb5e860a2dd9 (diff) | |
| parent | 5182542126a5ad3c40d958b0b72cfa16f4e8bd25 (diff) | |
Merge branch 'fixup-node-version-check' of github.com:bnoordhuis/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/shared.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py index 108a48a4..f6c0cc95 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -284,7 +284,7 @@ def check_node_version(): try: node = listify(NODE_JS) actual = Popen(node + ['--version'], stdout=PIPE).communicate()[0].strip() - version = tuple(map(int, actual.replace('v', '').split('.'))) + version = tuple(map(int, actual.replace('v', '').replace('-pre', '').split('.'))) if version >= EXPECTED_NODE_VERSION: return True logging.warning('node version appears too old (seeing "%s", expected "%s")' % (actual, 'v' + ('.'.join(map(str, EXPECTED_NODE_VERSION))))) |