summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-06-22 05:29:56 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-06-22 13:43:19 +0000
commit1d9e884232c5f89a896617f056fbfcceba1dea31 (patch)
treec34acb1e3eb0c885975550e267f2d4c5a9dcba95
parent2c81a756e310d59702b52ffc30d84aa9e11a8dbd (diff)
downloadpodman-1d9e884232c5f89a896617f056fbfcceba1dea31.tar.gz
podman-1d9e884232c5f89a896617f056fbfcceba1dea31.tar.bz2
podman-1d9e884232c5f89a896617f056fbfcceba1dea31.zip
We are using err in defer function, needs to be defined name
Since we are checking if err is non nil in defer function we need to define it, so that the check will work correctly. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #985 Approved by: mheon
-rw-r--r--libpod/container_api.go2
-rw-r--r--libpod/runtime.go2
-rw-r--r--libpod/storage.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go
index 96648ccf5..7613c8ea5 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -701,7 +701,7 @@ func (c *Container) Sync() error {
}
// RestartWithTimeout restarts a running container and takes a given timeout in uint
-func (c *Container) RestartWithTimeout(ctx context.Context, timeout uint) error {
+func (c *Container) RestartWithTimeout(ctx context.Context, timeout uint) (err error) {
if !c.batched {
c.lock.Lock()
defer c.lock.Unlock()
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 2584c091d..46d5a95ee 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -294,7 +294,7 @@ func NewRuntimeFromConfig(configPath string, options ...RuntimeOption) (runtime
// Make a new runtime based on the given configuration
// Sets up containers/storage, state store, OCI runtime
-func makeRuntime(runtime *Runtime) error {
+func makeRuntime(runtime *Runtime) (err error) {
// Find a working OCI runtime binary
foundRuntime := false
for _, path := range runtime.config.RuntimePath {
diff --git a/libpod/storage.go b/libpod/storage.go
index c5581d53c..b969df7f3 100644
--- a/libpod/storage.go
+++ b/libpod/storage.go
@@ -59,7 +59,7 @@ func (metadata *RuntimeContainerMetadata) SetMountLabel(mountLabel string) {
// CreateContainerStorage creates the storage end of things. We already have the container spec created
// TO-DO We should be passing in an Image object in the future.
-func (r *storageService) CreateContainerStorage(ctx context.Context, systemContext *types.SystemContext, imageName, imageID, containerName, containerID, mountLabel string, options *storage.ContainerOptions) (ContainerInfo, error) {
+func (r *storageService) CreateContainerStorage(ctx context.Context, systemContext *types.SystemContext, imageName, imageID, containerName, containerID, mountLabel string, options *storage.ContainerOptions) (cinfo ContainerInfo, err error) {
var imageConfig *v1.Image
if imageName != "" {
var ref types.ImageReference