diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-27 16:01:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 16:01:45 +0200 |
| commit | 0906b32087c3d7db6844873a7d46241430a1b065 (patch) | |
| tree | 3c68a0c2d6e2e5742b4cc314136ddb8e9877ec75 /pkg/varlinkapi/attach.go | |
| parent | 5e3d63a53c0762c99c5eb7863ef7fc8d0b2e8eec (diff) | |
| parent | 8561b996447793999a6465f9b9e3f0f7bbea2c6a (diff) | |
| download | podman-0906b32087c3d7db6844873a7d46241430a1b065.tar.gz podman-0906b32087c3d7db6844873a7d46241430a1b065.tar.bz2 podman-0906b32087c3d7db6844873a7d46241430a1b065.zip | |
Merge pull request #3442 from baude/removelibpodfrommainphase2
libpod removal from main (phase 2)
Diffstat (limited to 'pkg/varlinkapi/attach.go')
| -rw-r--r-- | pkg/varlinkapi/attach.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go index 3f0a119f4..afa88e6a3 100644 --- a/pkg/varlinkapi/attach.go +++ b/pkg/varlinkapi/attach.go @@ -58,7 +58,7 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st if err != nil { return call.ReplyErrorOccurred(err.Error()) } - if !start && state != libpod.ContainerStateRunning { + if !start && state != define.ContainerStateRunning { return call.ReplyErrorOccurred("container must be running to attach") } @@ -73,7 +73,7 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st } }() - if state == libpod.ContainerStateRunning { + if state == define.ContainerStateRunning { finalErr = attach(ctr, streams, detachKeys, resize, errChan) } else { finalErr = startAndAttach(ctr, streams, detachKeys, resize, errChan) |