diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-09 17:46:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 17:46:28 -0700 |
| commit | 60ef8f8da90ec5200e62b79b24324fefde2c7036 (patch) | |
| tree | ec403dcd9b0b80d188e400a18d432539b67faf28 /libpod/container_api.go | |
| parent | 40a1df38d1b6971dd1df9e06bf190c924dbad5a3 (diff) | |
| parent | 09ff62429a324e01ad2c584afe9a5f66f580ae78 (diff) | |
| download | podman-60ef8f8da90ec5200e62b79b24324fefde2c7036.tar.gz podman-60ef8f8da90ec5200e62b79b24324fefde2c7036.tar.bz2 podman-60ef8f8da90ec5200e62b79b24324fefde2c7036.zip | |
Merge pull request #2663 from jwhonce/wip/remote_umount
Implement podman-remote umount and rm command
Diffstat (limited to 'libpod/container_api.go')
| -rw-r--r-- | libpod/container_api.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 2a2381923..465b23831 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -15,7 +15,7 @@ import ( "github.com/containers/libpod/pkg/lookup" "github.com/containers/storage/pkg/stringid" "github.com/docker/docker/oci/caps" - opentracing "github.com/opentracing/opentracing-go" + "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/util/wait" @@ -174,7 +174,7 @@ func (c *Container) StopWithTimeout(timeout uint) error { if c.state.State == ContainerStateConfigured || c.state.State == ContainerStateUnknown || c.state.State == ContainerStatePaused { - return errors.Wrapf(ErrCtrStateInvalid, "can only stop created, running, or stopped containers") + return errors.Wrapf(ErrCtrStateInvalid, "can only stop created, running, or stopped containers. %s in state %s", c.ID(), c.state.State.String()) } if c.state.State == ContainerStateStopped || |