clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 13:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a panic when the exec fails to start

Browse Source 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
This commit is contained in:
Shijiang Wei
2015-08-22 00:01:44 +08:00
parent 5ceff3f191
commit fcf9daad91
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_utils.go
+3 -1
View File
@@ -602,7 +602,9 @@ func dockerCmdWithError(args ...string) (string, int, error) {
func dockerCmdWithStdoutStderr(c *check.C, args ...string) (string, string, int) {
stdout, stderr, status, err := runCommandWithStdoutStderr(exec.Command(dockerBinary, args...))
c.Assert(err, check.IsNil, check.Commentf("%q failed with errors: %s, %v", strings.Join(args, " "), stderr, err))
if c != nil {
c.Assert(err, check.IsNil, check.Commentf("%q failed with errors: %s, %v", strings.Join(args, " "), stderr, err))
}
return stdout, stderr, status
}