diff --git a/chromium_src/tools/web_dev_style/eslint.py b/chromium_src/tools/web_dev_style/eslint.py index 146396f614b..10b4c8abb51 100644 --- a/chromium_src/tools/web_dev_style/eslint.py +++ b/chromium_src/tools/web_dev_style/eslint.py @@ -23,4 +23,4 @@ def Run(_original_function, **kwargs): node_args += ['--ignore-pattern', '!.*'] node_args += kwargs['args'] - return brave_node.RunNode(node_args) + return brave_node.RunNodeRaw(node_args) diff --git a/script/brave_node.py b/script/brave_node.py index 02c5e68c1fd..ead49fe2e52 100755 --- a/script/brave_node.py +++ b/script/brave_node.py @@ -15,7 +15,7 @@ def PathInNodeModules(*args): return os.path.join(NODE_MODULES, *args) -def RunNode(cmd_parts, include_command_in_error=True): +def RunNodeRaw(cmd_parts): cmd = ['node'] + cmd_parts process = subprocess.Popen(cmd, cwd=os.getcwd(), @@ -23,11 +23,16 @@ def RunNode(cmd_parts, include_command_in_error=True): stderr=subprocess.PIPE, universal_newlines=True) stdout, stderr = process.communicate() + return process.returncode, stdout, stderr - if process.returncode != 0: + +def RunNode(cmd_parts, include_command_in_error=True): + returncode, stdout, stderr = RunNodeRaw(cmd_parts) + if returncode != 0: err = stderr if len(stderr) > 0 else stdout - raise RuntimeError(f"Command '{' '.join(cmd)}' failed\n{err}" - if include_command_in_error else err) + raise RuntimeError( + f"Command '{' '.join(['node'] + cmd_parts)}' failed\n{err}" + if include_command_in_error else err) return stdout