Merge pull request #7929 from kolyshkin/nits-err

Nits

1 files changed, 4 insertions, 10 deletions

diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go
index 2a73efe36..9de04266f 100644
--- a/pkg/checkpoint/checkpoint_restore.go
+++ b/pkg/checkpoint/checkpoint_restore.go
@@ -22,19 +22,13 @@ import (
 // crImportFromJSON imports the JSON files stored in the exported
 // checkpoint tarball
 func crImportFromJSON(filePath string, v interface{}) error {
-	jsonFile, err := os.Open(filePath)
+	content, err := ioutil.ReadFile(filePath)
 	if err != nil {
-		return errors.Wrapf(err, "Failed to open container definition %s for restore", filePath)
-	}
-	defer errorhandling.CloseQuiet(jsonFile)
-
-	content, err := ioutil.ReadAll(jsonFile)
-	if err != nil {
-		return errors.Wrapf(err, "Failed to read container definition %s for restore", filePath)
+		return errors.Wrap(err, "failed to read container definition for restore")
 	}
 	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(content, v); err != nil {
-		return errors.Wrapf(err, "Failed to unmarshal container definition %s for restore", filePath)
+		return errors.Wrapf(err, "failed to unmarshal container definition %s for restore", filePath)
 	}
 
 	return nil
@@ -47,7 +41,7 @@ func CRImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, input stri
 	// tarball to a temporary directory
 	archiveFile, err := os.Open(input)
 	if err != nil {
-		return nil, errors.Wrapf(err, "Failed to open checkpoint archive %s for import", input)
+		return nil, errors.Wrap(err, "failed to open checkpoint archive for import")
 	}
 	defer errorhandling.CloseQuiet(archiveFile)
 	options := &archive.TarOptions{