diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-10-15 06:06:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 06:06:45 -0400 |
| commit | 25572cefa8f16580c4a61af86cf2c41281e0300f (patch) | |
| tree | 4a1bdf52c2e6ac4013075bc4f9846a29828453b2 /libpod/runtime_cstorage.go | |
| parent | b6b3acf2d74958957b40d557bf103072d120213e (diff) | |
| parent | 17a7596af4f8e2898bd11945a5b3c085b882b021 (diff) | |
| download | podman-25572cefa8f16580c4a61af86cf2c41281e0300f.tar.gz podman-25572cefa8f16580c4a61af86cf2c41281e0300f.tar.bz2 podman-25572cefa8f16580c4a61af86cf2c41281e0300f.zip | |
Merge pull request #4262 from nalind/error-cause
Unwrap errors before comparing them
Diffstat (limited to 'libpod/runtime_cstorage.go')
| -rw-r--r-- | libpod/runtime_cstorage.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go index 47a91c881..2d523a7d2 100644 --- a/libpod/runtime_cstorage.go +++ b/libpod/runtime_cstorage.go @@ -68,7 +68,7 @@ func (r *Runtime) RemoveStorageContainer(idOrName string, force bool) error { func (r *Runtime) removeStorageContainer(idOrName string, force bool) error { targetID, err := r.store.Lookup(idOrName) if err != nil { - if err == storage.ErrLayerUnknown { + if errors.Cause(err) == storage.ErrLayerUnknown { return errors.Wrapf(define.ErrNoSuchCtr, "no container with ID or name %q found", idOrName) } return errors.Wrapf(err, "error looking up container %q", idOrName) @@ -78,7 +78,7 @@ func (r *Runtime) removeStorageContainer(idOrName string, force bool) error { // So we can still error here. ctr, err := r.store.Container(targetID) if err != nil { - if err == storage.ErrContainerUnknown { + if errors.Cause(err) == storage.ErrContainerUnknown { return errors.Wrapf(define.ErrNoSuchCtr, "%q does not refer to a container", idOrName) } return errors.Wrapf(err, "error retrieving container %q", idOrName) @@ -96,7 +96,7 @@ func (r *Runtime) removeStorageContainer(idOrName string, force bool) error { if !force { timesMounted, err := r.store.Mounted(ctr.ID) if err != nil { - if err == storage.ErrContainerUnknown { + if errors.Cause(err) == storage.ErrContainerUnknown { // Container was removed from under us. // It's gone, so don't bother erroring. logrus.Warnf("Storage for container %s already removed", ctr.ID) @@ -109,7 +109,7 @@ func (r *Runtime) removeStorageContainer(idOrName string, force bool) error { } } else { if _, err := r.store.Unmount(ctr.ID, true); err != nil { - if err == storage.ErrContainerUnknown { + if errors.Cause(err) == storage.ErrContainerUnknown { // Container again gone, no error logrus.Warnf("Storage for container %s already removed", ctr.ID) return nil @@ -119,7 +119,7 @@ func (r *Runtime) removeStorageContainer(idOrName string, force bool) error { } if err := r.store.DeleteContainer(ctr.ID); err != nil { - if err == storage.ErrContainerUnknown { + if errors.Cause(err) == storage.ErrContainerUnknown { // Container again gone, no error logrus.Warnf("Storage for container %s already removed", ctr.ID) return nil |