Commit 667671a

facchinmcmaglie

authored and

committed

Avoid setting build_cache path if not specified

Fixes arduino/Arduino#9189 Also, creates the directory if nonexistent.

1 parent bc2846e commit 667671aCopy full SHA for 667671a

File tree

+10

-14

lines changed

+10

-14

lines changed

Lines changed: 10 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -319,23 +319,19 @@ func main() {`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`// FLAG_BUILD_CACHE`
`322`		`- buildCachePathUnquoted, err := gohasissues.Unquote(*buildCachePathFlag)`
`323`		`- if err != nil {`
`324`		`- printCompleteError(err)`
`325`		`- }`
`326`		`- buildCachePath := paths.New(buildCachePathUnquoted)`
`327`		`- if buildCachePath != nil {`
`328`		`- // TODO: mmmmhhh... this one looks like a bug, why check existence?`
`329`		`- if _, err := buildCachePath.Stat(); err != nil {`
`330`		`- fmt.Fprintln(os.Stderr, err)`
`331`		`- os.Exit(1)`
`332`		`- }`
`333`		`-`
`334`		`- if err := buildCachePath.MkdirAll(); err != nil {`
	`322`	`+ if *buildCachePathFlag != "" {`
	`323`	`+ buildCachePathUnquoted, err := gohasissues.Unquote(*buildCachePathFlag)`
	`324`	`+ if err != nil {`
`335`	`325`	`printCompleteError(err)`
`336`	`326`	`}`
	`327`	`+ buildCachePath := paths.New(buildCachePathUnquoted)`
	`328`	`+ if buildCachePath != nil {`
	`329`	`+ if err := buildCachePath.MkdirAll(); err != nil {`
	`330`	`+ printCompleteError(err)`
	`331`	`+ }`
	`332`	`+ }`
	`333`	`+ ctx.BuildCachePath = buildCachePath`
`337`	`334`	`}`
`338`		`- ctx.BuildCachePath = buildCachePath`
`339`	`335`
`340`	`336`	`// FLAG_VID_PID`
`341`	`337`	`if *vidPidFlag != "" {`

Comments

(0)