diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-20 22:00:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 22:00:43 +0200 |
| commit | a791242dfb49a993b7a717a945e3c96f675c4c5f (patch) | |
| tree | 6b887082d9d95537050d9db3fd8822bbf170377b /libpod/container_api.go | |
| parent | 9567d87bdf244de62f7c6763191dc7bf12e425cd (diff) | |
| parent | f86bb561efea8b639a2711ea4798d071b2180e29 (diff) | |
| download | podman-a791242dfb49a993b7a717a945e3c96f675c4c5f.tar.gz podman-a791242dfb49a993b7a717a945e3c96f675c4c5f.tar.bz2 podman-a791242dfb49a993b7a717a945e3c96f675c4c5f.zip | |
Merge pull request #3162 from giuseppe/fix-hang-waitforfile
util: fix race condition in WaitForFile
Diffstat (limited to 'libpod/container_api.go')
| -rw-r--r-- | libpod/container_api.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 06a31da11..eff5bfe5f 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -289,8 +289,8 @@ func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir chWait := make(chan error) go func() { chWait <- execCmd.Wait() + close(chWait) }() - defer close(chWait) pidFile := c.execPidPath(sessionID) // 60 second seems a reasonable time to wait |