From 7c13d16a623d11422da692c77d52bd17dba6a5fd Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 8 Aug 2016 13:48:27 +0530 Subject: [PATCH] Fixed patch --- bench/patches/v4/update_node.py | 41 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/bench/patches/v4/update_node.py b/bench/patches/v4/update_node.py index d67697f2..58919771 100644 --- a/bench/patches/v4/update_node.py +++ b/bench/patches/v4/update_node.py @@ -3,26 +3,27 @@ from semantic_version import Version from distutils.spawn import find_executable def execute(bench_path): - expected_node_ver = Version('5.0.0') - node_exec = find_executable('node') + expected_node_ver = Version('5.0.0') + node_exec = find_executable('node') or find_executable('nodejs') - if node_exec: - result = subprocess.check_output([node_exec, '-v']) - else: - click.echo(''' - No node executable was found on your machine. - Please install node 5.x before running "bench update". - Installation instructions for CentOS and Ubuntu can be found on the following link, - "https://www.metachris.com/2015/10/how-to-install-nodejs-5-on-centos-and-ubuntu/" - ''') - sys.exit(1) - node_ver = Version(result.rstrip('\n').lstrip('v')) + if node_exec: + result = subprocess.check_output([node_exec, '-v']) + else: + click.echo(''' + No node executable was found on your machine. + Please install node 5.x before running "bench update". + Installation instructions for CentOS and Ubuntu can be found on the following link, + "https://www.metachris.com/2015/10/how-to-install-nodejs-5-on-centos-and-ubuntu/" + ''') + sys.exit(1) - if node_ver < expected_node_ver: - click.echo(''' - Please update node version to 5.x before running "bench update". - Installation instructions for CentOS and Ubuntu can be found on the following link, - "https://www.metachris.com/2015/10/how-to-install-nodejs-5-on-centos-and-ubuntu/" - ''') - sys.exit(1) + node_ver = Version(result.rstrip('\n').lstrip('v')) + + if node_ver < expected_node_ver: + click.echo(''' + Please update node version to 5.x before running "bench update". + Installation instructions for CentOS and Ubuntu can be found on the following link, + "https://www.metachris.com/2015/10/how-to-install-nodejs-5-on-centos-and-ubuntu/" + ''') + sys.exit(1)