Merge pull request #447 from thaJeztah/19.03_backport_fix_containerStart_unhandled_error

thaJeztah · web-flow · commit 8f7f8f44fec2 · 2020-01-23T20:22:20.000+01:00
[19.03 backport] daemon:containerStart() fix unhandled error for saveApparmorConfig
Upstream-commit: efe241644b11a17d8f12a497b465b82a89f809d2
Component: engine
diff --git a/components/engine/daemon/start.go b/components/engine/daemon/start.go
@@ -161,7 +161,7 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint
 		container.HasBeenManuallyStopped = false
 	}
 
-	if daemon.saveApparmorConfig(container); err != nil {
+	if err := daemon.saveApparmorConfig(container); err != nil {
 		return err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func (daemon Daemon) containerStart(container container.Container, checkpoint`
`161`	`161`	`container.HasBeenManuallyStopped = false`
`162`	`162`	`}`
`163`	`163`
`164`		`- if daemon.saveApparmorConfig(container); err != nil {`
	`164`	`+ if err := daemon.saveApparmorConfig(container); err != nil {`
`165`	`165`	`return err`
`166`	`166`	`}`
`167`	`167`