diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-11 10:01:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 10:01:25 -0700 |
| commit | 6421208e0f6ff1fba58eafdab12e897b5ed12e3b (patch) | |
| tree | d2a44ec8b92d343d675027f524738875191027d8 /libpod | |
| parent | f5afe88098d8825ea63ccb63875d48edab0eb111 (diff) | |
| parent | 231129e4dc083d9f63cf1876cc1695f7f8c03f25 (diff) | |
| download | podman-6421208e0f6ff1fba58eafdab12e897b5ed12e3b.tar.gz podman-6421208e0f6ff1fba58eafdab12e897b5ed12e3b.tar.bz2 podman-6421208e0f6ff1fba58eafdab12e897b5ed12e3b.zip | |
Merge pull request #2583 from giuseppe/rootless-fix-pod-rm
rootless: fix stop and rm when the container is running with uid != 0
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index d86062e38..00e6786f9 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -1086,7 +1086,7 @@ func (c *Container) cleanupStorage() error { // error // We still want to be able to kick the container out of the // state - if err == storage.ErrNotAContainer || err == storage.ErrContainerUnknown { + if errors.Cause(err) == storage.ErrNotAContainer || errors.Cause(err) == storage.ErrContainerUnknown { logrus.Errorf("Storage for container %s has been removed", c.ID()) return nil } |