Skip to content

Commit

Permalink
solves docker inconsistency for podman attach x
Browse files Browse the repository at this point in the history
Signed-off-by: Parker Van Roy <pvanroy@redhat.com>
  • Loading branch information
ParkerVR committed Oct 7, 2020
1 parent 9ae873e commit 7d251fd
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pkg/domain/infra/abi/containers.go
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string,
reports = append(reports, &report)
continue
}
report.Err = errors.Wrapf(err, "failed to evict container: %q", id)
report.Err = errors.Wrapf(err, "Failed to evict container: %q", id)
reports = append(reports, &report)
continue
}
Expand Down Expand Up @@ -582,6 +582,7 @@ func (ic *ContainerEngine) ContainerAttach(ctx context.Context, nameOrID string,
if err != nil && errors.Cause(err) != define.ErrDetach {
return errors.Wrapf(err, "error attaching to container %s", ctr.ID())
}
os.Stdout.WriteString("read escape sequence\n")
return nil
}

Expand All @@ -604,7 +605,7 @@ func checkExecPreserveFDs(options entities.ExecOptions) error {
if options.PreserveFDs > 0 {
entries, err := ioutil.ReadDir("/proc/self/fd")
if err != nil {
return err
return errors.Wrapf(err, "unable to read /proc/self/fd")
}

m := make(map[int]bool)
Expand Down

0 comments on commit 7d251fd

Please sign in to comment.