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

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

View File

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