diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-06 16:16:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 16:16:49 -0400 |
| commit | d83f49ef6b8a53535257bb56f5573ef3f65e3ba9 (patch) | |
| tree | 913102be0b4701edc9907e326e249deaf2a75a2f /libpod/in_memory_state.go | |
| parent | b7dd714532e0445438e9c5fc5be7f8e0271c21d0 (diff) | |
| parent | 6acd265306370ab5cfeaf2843bd359fe13216d92 (diff) | |
| download | podman-d83f49ef6b8a53535257bb56f5573ef3f65e3ba9.tar.gz podman-d83f49ef6b8a53535257bb56f5573ef3f65e3ba9.tar.bz2 podman-d83f49ef6b8a53535257bb56f5573ef3f65e3ba9.zip | |
Merge pull request #9754 from mheon/add_dep
Add --requires flag to podman run/create
Diffstat (limited to 'libpod/in_memory_state.go')
| -rw-r--r-- | libpod/in_memory_state.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/in_memory_state.go b/libpod/in_memory_state.go index 3875878ed..df45f8e73 100644 --- a/libpod/in_memory_state.go +++ b/libpod/in_memory_state.go @@ -391,7 +391,7 @@ func (s *InMemoryState) RemoveContainer(ctr *Container) error { deps, ok := s.ctrDepends[ctr.ID()] if ok && len(deps) != 0 { depsStr := strings.Join(deps, ", ") - return errors.Wrapf(define.ErrCtrExists, "the following containers depend on container %s: %s", ctr.ID(), depsStr) + return errors.Wrapf(define.ErrDepExists, "the following containers depend on container %s: %s", ctr.ID(), depsStr) } // Ensure we don't have active exec sessions @@ -1497,7 +1497,7 @@ func (s *InMemoryState) RemoveContainerFromPod(pod *Pod, ctr *Container) error { deps, ok := s.ctrDepends[ctr.ID()] if ok && len(deps) != 0 { depsStr := strings.Join(deps, ", ") - return errors.Wrapf(define.ErrCtrExists, "the following containers depend on container %s: %s", ctr.ID(), depsStr) + return errors.Wrapf(define.ErrDepExists, "the following containers depend on container %s: %s", ctr.ID(), depsStr) } // Ensure we don't have active exec sessions |