ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-04 00:30:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use _.defaults instead of _.extend to ensure internal env vars are not overwritten

Browse Source
This commit is contained in:
Pablo Carranza Velez 2016-01-21 17:14:50 -03:00
parent 3e18a350f1
commit 0f20251a8b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,3 +1,4 @@
* Use _.defaults instead of _.extend to ensure internal env vars are not overwritten [Pablo]
* Expose resin API key to apps [Pablo] * Expose resin API key to apps [Pablo]
* On download start, set download_progress to 0. On finish, set state to Idle [Pablo] * On download start, set download_progress to 0. On finish, set state to Idle [Pablo]
* Set GOARM separately for each architecture [Pablo] * Set GOARM separately for each architecture [Pablo]

2
src/utils.coffee
View File

@ -143,7 +143,7 @@ exports.extendEnvVars = (env, uuid) ->
RESIN: '1' RESIN: '1'
USER: 'root' USER: 'root'
if env? if env?
_.extend(newEnv, env) _.defaults(newEnv, env)
return Promise.props(newEnv) return Promise.props(newEnv)
# Callback function to enable/disable tcp pings # Callback function to enable/disable tcp pings