diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-01 18:26:58 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-01 18:26:58 -0700 |
| commit | 3d48329892cd517b2e709ef94a00df8214169ddd (patch) | |
| tree | 988d17b59d4fc2473a6d7a63df0f4117b711bcf4 /tools/shared.py | |
| parent | 75af3c1ac8dba93b508b8b431bef9a35e6b054c3 (diff) | |
| parent | 2c3d580bf9122ec4aef9ee8d462281d3fd810355 (diff) | |
Merge branch 'incoming' into f32
Conflicts:
src/parseTools.js
Diffstat (limited to 'tools/shared.py')
| -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 6ba6ef50..252e3844 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))))) |