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

Merge pull request #777 from resin-io/fix-local-detection

Browse Source 
fix: Run checkTruthy on config values before using them
This commit is contained in:
CameronDiver 2018-10-23 20:29:41 +02:00 committed by GitHub
commit 45dc26e344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/application-manager.coffee
View File

@ -143,7 +143,7 @@ module.exports = class ApplicationManager extends EventEmitter
saveImage: (step) => saveImage: (step) =>
@images.save(step.image) @images.save(step.image)
cleanup: (step) => cleanup: (step) =>
@config.get('localMode').then (localMode) -> @config.get('localMode').then (localMode) =>
if !checkTruthy(localMode) if !checkTruthy(localMode)
@images.cleanup() @images.cleanup()
createNetworkOrVolume: (step) => createNetworkOrVolume: (step) =>
@ -905,8 +905,8 @@ module.exports = class ApplicationManager extends EventEmitter
@networks.supervisorNetworkReady() @networks.supervisorNetworkReady()
@config.get('delta') @config.get('delta')
(cleanupNeeded, availableImages, downloading, supervisorNetworkReady, delta) => (cleanupNeeded, availableImages, downloading, supervisorNetworkReady, delta) =>
conf = { delta, localMode } conf = _.mapValues({ delta, localMode }, (v) -> checkTruthy(v))
if localMode if conf.localMode
cleanupNeeded = false cleanupNeeded = false
@_inferNextSteps(cleanupNeeded, availableImages, downloading, supervisorNetworkReady, currentState, targetState, ignoreImages, conf) @_inferNextSteps(cleanupNeeded, availableImages, downloading, supervisorNetworkReady, currentState, targetState, ignoreImages, conf)
.then (nextSteps) => .then (nextSteps) =>