update npm's user info envs

Proposed fix for #24231.
This commit is contained in:
Justin Findlay 2015-06-05 11:33:56 -06:00
parent cb572f8c41
commit 8140c96949

View file

@ -119,6 +119,11 @@ def install(pkg=None,
elif pkgs:
cmd += ' "{0}"'.format('" "'.join(pkgs))
if runas:
uid = salt.utils.get_uid(runas)
if uid:
env.update({'SUDO_UID': uid, 'SUDO_USER': ''})
result = __salt__['cmd.run_all'](cmd, python_shell=False, cwd=dir, runas=runas, env=env)
if result['retcode'] != 0:
@ -183,6 +188,11 @@ def uninstall(pkg,
'''
if runas:
uid = salt.utils.get_uid(runas)
if uid:
env.update({'SUDO_UID': uid, 'SUDO_USER': ''})
cmd = 'npm uninstall'
if dir is None:
@ -235,6 +245,11 @@ def list_(pkg=None,
'''
if runas:
uid = salt.utils.get_uid(runas)
if uid:
env.update({'SUDO_UID': uid, 'SUDO_USER': ''})
cmd = 'npm list --silent --json'
if dir is None: