5 files changed, 28 insertions, 19 deletions

diff --git a/pkg/adapter/checkpoint_restore.go b/pkg/adapter/checkpoint_restore.go
index 97ba5ecf7..ec1464fb1 100644
--- a/pkg/adapter/checkpoint_restore.go
+++ b/pkg/adapter/checkpoint_restore.go
@@ -4,16 +4,19 @@ package adapter
 
 import (
 	"context"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/pkg/errorhandling"
 	"github.com/containers/storage/pkg/archive"
 	jsoniter "github.com/json-iterator/go"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
+	"github.com/sirupsen/logrus"
 )
 
 // Prefixing the checkpoint/restore related functions with 'cr'
@@ -25,7 +28,7 @@ func crImportFromJSON(filePath string, v interface{}) error {
 	if err != nil {
 		return errors.Wrapf(err, "Failed to open container definition %s for restore", filePath)
 	}
-	defer jsonFile.Close()
+	defer errorhandling.CloseQuiet(jsonFile)
 
 	content, err := ioutil.ReadAll(jsonFile)
 	if err != nil {
@@ -48,7 +51,7 @@ func crImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, input stri
 	if err != nil {
 		return nil, errors.Wrapf(err, "Failed to open checkpoint archive %s for import", input)
 	}
-	defer archiveFile.Close()
+	defer errorhandling.CloseQuiet(archiveFile)
 	options := &archive.TarOptions{
 		// Here we only need the files config.dump and spec.dump
 		ExcludePatterns: []string{
@@ -62,15 +65,19 @@ func crImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, input stri
 	if err != nil {
 		return nil, err
 	}
-	defer os.RemoveAll(dir)
+	defer func() {
+		if err := os.RemoveAll(dir); err != nil {
+			logrus.Errorf("could not recursively remove %s: %q", dir, err)
+		}
+	}()
 	err = archive.Untar(archiveFile, dir, options)
 	if err != nil {
 		return nil, errors.Wrapf(err, "Unpacking of checkpoint archive %s failed", input)
 	}
 
 	// Load spec.dump from temporary directory
-	spec := new(spec.Spec)
-	if err := crImportFromJSON(filepath.Join(dir, "spec.dump"), spec); err != nil {
+	dumpSpec := new(spec.Spec)
+	if err := crImportFromJSON(filepath.Join(dir, "spec.dump"), dumpSpec); err != nil {
 		return nil, err
 	}
 
@@ -112,7 +119,7 @@ func crImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, input stri
 	}
 
 	// Now create a new container from the just loaded information
-	container, err := runtime.RestoreContainer(ctx, spec, config)
+	container, err := runtime.RestoreContainer(ctx, dumpSpec, config)
 	if err != nil {
 		return nil, err
 	}
@@ -127,7 +134,7 @@ func crImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, input stri
 		return nil, errors.Errorf("Name of restored container (%s) does not match requested name (%s)", containerConfig.Name, ctrName)
 	}
 
-	if newName == false {
+	if !newName {
 		// Only check ID for a restore with the same name.
 		// Using -n to request a new name for the restored container, will also create a new ID
 		if containerConfig.ID != ctrID {
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
index 1cf9d686a..86e9c0266 100644
--- a/pkg/adapter/containers.go
+++ b/pkg/adapter/containers.go
@@ -213,8 +213,8 @@ func (r *LocalRuntime) RemoveContainers(ctx context.Context, cli *cliconfig.RmVa
 		c := c
 
 		pool.Add(shared.Job{
-			c.ID(),
-			func() error {
+			ID: c.ID(),
+			Fn: func() error {
 				err := r.RemoveContainer(ctx, c, cli.Force, cli.Volumes)
 				if err != nil {
 					logrus.Debugf("Failed to remove container %s: %s", c.ID(), err.Error())
diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go
index a28e1ab4b..b45b02d09 100644
--- a/pkg/adapter/pods.go
+++ b/pkg/adapter/pods.go
@@ -70,8 +70,9 @@ func (r *LocalRuntime) PrunePods(ctx context.Context, cli *cliconfig.PodPruneVal
 	for _, p := range pods {
 		p := p
 
-		pool.Add(shared.Job{p.ID(),
-			func() error {
+		pool.Add(shared.Job{
+			ID: p.ID(),
+			Fn: func() error {
 				err := r.Runtime.RemovePod(ctx, p, cli.Force, cli.Force)
 				if err != nil {
 					logrus.Debugf("Failed to remove pod %s: %s", p.ID(), err.Error())
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go
index 8ef88f36b..e65f07898 100644
--- a/pkg/adapter/runtime.go
+++ b/pkg/adapter/runtime.go
@@ -359,9 +359,6 @@ func (r *LocalRuntime) Events(c *cliconfig.EventValues) error {
 	if eventsError != nil {
 		return eventsError
 	}
-	if err != nil {
-		return errors.Wrapf(err, "unable to tail the events log")
-	}
 	w := bufio.NewWriter(os.Stdout)
 	for event := range eventChannel {
 		if len(c.Format) > 0 {
diff --git a/pkg/adapter/terminal_linux.go b/pkg/adapter/terminal_linux.go
index be7dc0cb6..e3255ecb6 100644
--- a/pkg/adapter/terminal_linux.go
+++ b/pkg/adapter/terminal_linux.go
@@ -39,7 +39,11 @@ func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr,
 			return err
 		}
 
-		defer restoreTerminal(oldTermState)
+		defer func() {
+			if err := restoreTerminal(oldTermState); err != nil {
+				logrus.Errorf("unable to restore terminal: %q", err)
+			}
+		}()
 	}
 
 	streams := new(libpod.AttachStreams)