opendev/gerrit
Code Issues Proposed changes

run_npm_binary.py: Support Debian's "nodejs"

Browse Source 
Change-Id: Iaf37279cdf5d225f425eec7f87eed5dd5531be7c
This commit is contained in:
Dave Borowitz 2015-11-13 12:21:46 -05:00
parent 01b4f192fc
commit b9fe4daf26
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/js/run_npm_binary.py
View File

@ -16,9 +16,11 @@
from __future__ import print_function
import atexit
from distutils import spawn
import hashlib
import os
import shutil
import subprocess
import sys
import tarfile
import tempfile
@ -84,7 +86,13 @@ def main(args):
if not os.path.isfile(bin):
extract(path, outdir, rel_bin)
os.execv(bin, args[1:])
nodejs = spawn.find_executable('nodejs')
if nodejs:
# Debian installs Node.js as 'nodejs', due to a conflict with another
# package.
subprocess.check_call([nodejs, bin] + args[1:])
else:
subprocess.check_call([bin] + args[1:])
if __name__ == '__main__':