Skip to content

Commit

Permalink
Don't return if err is nil, causes destroy container to fail.
Browse files Browse the repository at this point in the history
  • Loading branch information
hmlanigan committed Oct 19, 2020
1 parent a29eda0 commit 186aa71
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion state/machine.go
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ func (original *Machine) advanceLifecycle(life Life, force, dyingAllowContainers
}

if canDie && !dyingAllowContainers {
if err := m.evaulateContainersAdvanceLifecycle(); !IsHasContainersError(err) {
if err := m.evaulateContainersAdvanceLifecycle(); err != nil && !IsHasContainersError(err) {
return nil, err
} else if IsHasContainersError(err) {
canDie = false
Expand Down

0 comments on commit 186aa71

Please sign in to comment.