diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2020-08-03 22:21:24 +0200 |
|---|---|---|
| committer | Paul Holzinger <paul.holzinger@web.de> | 2020-08-04 11:39:27 +0200 |
| commit | 97b2b079532ba983820e259b96ede027b846888b (patch) | |
| tree | d11b7e2133d8bd8298c26440989531d49703592e /libpod/boltdb_state_internal.go | |
| parent | 1709335cf04e947117d4ae4dca72f24f4095511b (diff) | |
| download | podman-97b2b079532ba983820e259b96ede027b846888b.tar.gz podman-97b2b079532ba983820e259b96ede027b846888b.tar.bz2 podman-97b2b079532ba983820e259b96ede027b846888b.zip | |
Improve error message when creating a pod/ctr with the same name
Check if there is an pod or container an return
the appropriate error message instead of blindly
return 'container exists' with `podman create` and
'pod exists' with `podman pod create`.
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'libpod/boltdb_state_internal.go')
| -rw-r--r-- | libpod/boltdb_state_internal.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index ddbd40da8..9be753d26 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -586,11 +586,19 @@ func (s *BoltState) addContainer(ctr *Container, pod *Pod) error { // Check if we already have a container with the given ID and name idExist := idsBucket.Get(ctrID) if idExist != nil { - return errors.Wrapf(define.ErrCtrExists, "ID %s is in use", ctr.ID()) + err = define.ErrCtrExists + if allCtrsBucket.Get(idExist) == nil { + err = define.ErrPodExists + } + return errors.Wrapf(err, "ID \"%s\" is in use", ctr.ID()) } nameExist := namesBucket.Get(ctrName) if nameExist != nil { - return errors.Wrapf(define.ErrCtrExists, "name %s is in use", ctr.Name()) + err = define.ErrCtrExists + if allCtrsBucket.Get(nameExist) == nil { + err = define.ErrPodExists + } + return errors.Wrapf(err, "name \"%s\" is in use", ctr.Name()) } // No overlapping containers |