From 8eed6a4b38d69c1851d129f2d69d4b26b9425c7e Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 1 Dec 2017 16:01:55 +0000 Subject: [PATCH] linuxkit: Rename Pkg.pkgPath to Pkg.path Previous name a bit stuttery. Signed-off-by: Ian Campbell --- src/cmd/linuxkit/pkglib/build.go | 2 +- src/cmd/linuxkit/pkglib/pkglib.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmd/linuxkit/pkglib/build.go b/src/cmd/linuxkit/pkglib/build.go index 0f1c08a19..f399409e5 100644 --- a/src/cmd/linuxkit/pkglib/build.go +++ b/src/cmd/linuxkit/pkglib/build.go @@ -137,7 +137,7 @@ func (p Pkg) Build(bos ...BuildOpt) error { args = append(args, "--label=org.mobyproject.linuxkit.version="+version.Version) args = append(args, "--label=org.mobyproject.linuxkit.revision="+version.GitCommit) - if err := d.build(p.Tag()+suffix, p.pkgPath, args...); err != nil { + if err := d.build(p.Tag()+suffix, p.path, args...); err != nil { return err } diff --git a/src/cmd/linuxkit/pkglib/pkglib.go b/src/cmd/linuxkit/pkglib/pkglib.go index f698c326a..4be87a76e 100644 --- a/src/cmd/linuxkit/pkglib/pkglib.go +++ b/src/cmd/linuxkit/pkglib/pkglib.go @@ -37,7 +37,7 @@ type Pkg struct { config *moby.ImageConfig // Internal state - pkgPath string + path string hash string dirty bool commitHash string @@ -191,7 +191,7 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) { cache: !pi.DisableCache, config: pi.Config, dirty: dirty, - pkgPath: pkgPath, + path: pkgPath, git: git, }, nil }