From a1865e9d8b05b00d5c2364073acfb4467ffc67d7 Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Wed, 20 Sep 2017 13:16:22 -0400 Subject: [PATCH] fixing error checking due to update in make lint make lint is complaining for cases where the error returned is checked for err != nil, and then returned anyways. Signed-off-by: umohnani8 --- cmd/skopeo/delete.go | 5 +---- cmd/skopeo/layers.go | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cmd/skopeo/delete.go b/cmd/skopeo/delete.go index 99018bd5..0c89e59c 100644 --- a/cmd/skopeo/delete.go +++ b/cmd/skopeo/delete.go @@ -24,10 +24,7 @@ func deleteHandler(context *cli.Context) error { if err != nil { return err } - if err := ref.DeleteImage(ctx); err != nil { - return err - } - return nil + return ref.DeleteImage(ctx) } var deleteCmd = cli.Command{ diff --git a/cmd/skopeo/layers.go b/cmd/skopeo/layers.go index 6ede9c42..875f1a84 100644 --- a/cmd/skopeo/layers.go +++ b/cmd/skopeo/layers.go @@ -109,10 +109,6 @@ var layersCmd = cli.Command{ return err } - if err := dest.Commit(); err != nil { - return err - } - - return nil + return dest.Commit() }, }