summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/abi/containers.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-01 20:59:05 +0200
committerGitHub <noreply@github.com>2020-05-01 20:59:05 +0200
commit95b9b72c0c0c6904ca35c97c76ee728b1750bf84 (patch)
tree1c581c1e6633db96b899f13b09a6160b77553630 /pkg/domain/infra/abi/containers.go
parenta451048efc67d404d4af934757179819106d9d22 (diff)
parentb22a39b6b15bd082f7d4c83d306e43b2e6ca856b (diff)
downloadpodman-95b9b72c0c0c6904ca35c97c76ee728b1750bf84.tar.gz
podman-95b9b72c0c0c6904ca35c97c76ee728b1750bf84.tar.bz2
podman-95b9b72c0c0c6904ca35c97c76ee728b1750bf84.zip
Merge pull request #6062 from jwhonce/wip/docs
[CI:DOC] Bring README.md up to date
Diffstat (limited to 'pkg/domain/infra/abi/containers.go')
-rw-r--r--pkg/domain/infra/abi/containers.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index f4996583a..99a74d5bf 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -523,7 +523,8 @@ func (ic *ContainerEngine) ContainerAttach(ctx context.Context, nameOrId string,
}
// If the container is in a pod, also set to recursively start dependencies
- if err := terminal.StartAttachCtr(ctx, ctr, options.Stdout, options.Stderr, options.Stdin, options.DetachKeys, options.SigProxy, false, ctr.PodID() != ""); err != nil && errors.Cause(err) != define.ErrDetach {
+ err = terminal.StartAttachCtr(ctx, ctr, options.Stdout, options.Stderr, options.Stdin, options.DetachKeys, options.SigProxy, false, ctr.PodID() != "")
+ if err != nil && errors.Cause(err) != define.ErrDetach {
return errors.Wrapf(err, "error attaching to container %s", ctr.ID())
}
return nil