Yuvipanda has submitted this change and it was merged.

Change subject: toollabs: Pass in full parent environment to npm start
......................................................................


toollabs: Pass in full parent environment to npm start

Otherwise it sometimes freaks out, and does strange things like
look for sh in /usr/bin and fail when it does not find it there

Bug: T1102
Change-Id: I86f8ac6efd9baf7fbab8e0ad8fd27ee566ff47b3
---
M modules/toollabs/files/tool-nodejs
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/toollabs/files/tool-nodejs 
b/modules/toollabs/files/tool-nodejs
index 2c85cf6..4db6c5f 100644
--- a/modules/toollabs/files/tool-nodejs
+++ b/modules/toollabs/files/tool-nodejs
@@ -18,8 +18,8 @@
 
 os.chdir(os.path.expanduser('~/www/js'))
 
-env = {
-    'TOOL_WEB_PORT': str(PORT)
-}
+# Pass in all of our parent environment too
+# npm doesn't like it too much if you give it an almost empty environment
+os.environ['TOOL_WEB_PORT'] = str(PORT)
 
-os.execve('/usr/bin/npm', ['/usr/bin/npm', 'start'], env)
+os.execv('/usr/bin/npm', ['/usr/bin/npm', 'start'])

-- 
To view, visit https://gerrit.wikimedia.org/r/188985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I86f8ac6efd9baf7fbab8e0ad8fd27ee566ff47b3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to