go/ko-build
1
0
Fork 0
mirror of https://github.com/ko-build/ko.git synced 2025-07-12 23:50:31 +02:00
Code Issues Releases Activity

Always clean Dir for packages.Load

Browse Source
This commit is contained in:
Jon Johnson
2021-12-16 11:21:02 -08:00
committed by Halvard Skogsrud
parent 8135bf22e9
commit 73a4629033
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/build/gobuild.go
View File

@ -161,8 +161,8 @@ func NewGo(ctx context.Context, dir string, options ...Option) (Interface, error
} }
func (g *gobuild) qualifyLocalImport(importpath string) (string, error) { func (g *gobuild) qualifyLocalImport(importpath string) (string, error) {
dir := g.dir dir := filepath.Clean(g.dir)
if filepath.Clean(g.dir) == "." { if dir == "." {
dir = "" dir = ""
} }
cfg := &packages.Config{ cfg := &packages.Config{
@ -203,8 +203,8 @@ func (g *gobuild) IsSupportedReference(s string) error {
if !ref.IsStrict() { if !ref.IsStrict() {
return errors.New("importpath does not start with ko://") return errors.New("importpath does not start with ko://")
} }
dir := g.dir dir := filepath.Clean(g.dir)
if filepath.Clean(g.dir) == "." { if dir == "." {
dir = "" dir = ""
} }
pkgs, err := packages.Load(&packages.Config{Dir: dir, Mode: packages.NeedName}, ref.Path()) pkgs, err := packages.Load(&packages.Config{Dir: dir, Mode: packages.NeedName}, ref.Path())
@ -446,8 +446,8 @@ func tarBinary(name, binary string, platform *v1.Platform) (*bytes.Buffer, error
} }
func (g *gobuild) kodataPath(ref reference) (string, error) { func (g *gobuild) kodataPath(ref reference) (string, error) {
dir := g.dir dir := filepath.Clean(g.dir)
if filepath.Clean(g.dir) == "." { if dir == "." {
dir = "" dir = ""
} }
pkgs, err := packages.Load(&packages.Config{Dir: dir, Mode: packages.NeedFiles}, ref.Path()) pkgs, err := packages.Load(&packages.Config{Dir: dir, Mode: packages.NeedFiles}, ref.Path())

4
pkg/commands/options/build.go
View File

@ -180,8 +180,8 @@ func createBuildConfigMap(workingDirectory string, configs []build.Config) (map[
// local import paths, therefore add a "./" equivalent as a prefix to // local import paths, therefore add a "./" equivalent as a prefix to
// the constructured import path // the constructured import path
localImportPath := fmt.Sprint(".", string(filepath.Separator), path) localImportPath := fmt.Sprint(".", string(filepath.Separator), path)
dir := baseDir dir := filepath.Clean(baseDir)
if filepath.Clean(dir) == "." { if dir == "." {
dir = "" dir = ""
} }
pkgs, err := packages.Load(&packages.Config{Mode: packages.NeedName, Dir: dir}, localImportPath) pkgs, err := packages.Load(&packages.Config{Mode: packages.NeedName, Dir: dir}, localImportPath)