From 958cafb2c0241630bcc0e162114433c49f631709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Wed, 11 Jul 2018 22:58:32 +0200 Subject: [PATCH] Inline contextsFromCopyOptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was not really any clearer when broken out. We already have a pair of trivial src/dest API calls before this, so adding a similar src/dest call for SystemContext follows the pattern. Signed-off-by: Miloslav Trmač --- cmd/skopeo/copy.go | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/cmd/skopeo/copy.go b/cmd/skopeo/copy.go index 75aa6226..442af8d6 100644 --- a/cmd/skopeo/copy.go +++ b/cmd/skopeo/copy.go @@ -11,26 +11,10 @@ import ( "github.com/containers/image/manifest" "github.com/containers/image/transports" "github.com/containers/image/transports/alltransports" - "github.com/containers/image/types" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" ) -// contextsFromCopyOptions returns source and destionation types.SystemContext depending on opts. -func contextsFromCopyOptions(opts *copyOptions) (*types.SystemContext, *types.SystemContext, error) { - sourceCtx, err := opts.srcImage.newSystemContext() - if err != nil { - return nil, nil, err - } - - destinationCtx, err := opts.destImage.newSystemContext() - if err != nil { - return nil, nil, err - } - - return sourceCtx, destinationCtx, nil -} - type copyOptions struct { global *globalOptions srcImage *imageOptions @@ -111,7 +95,11 @@ func (opts *copyOptions) run(c *cli.Context) error { return fmt.Errorf("Invalid destination name %s: %v", c.Args()[1], err) } - sourceCtx, destinationCtx, err := contextsFromCopyOptions(opts) + sourceCtx, err := opts.srcImage.newSystemContext() + if err != nil { + return err + } + destinationCtx, err := opts.destImage.newSystemContext() if err != nil { return err }