tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'aosp/upstream' am: eecfdd316b

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1557261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8442949eb048eda9112336f446c5eb683d1cf505
This commit is contained in:
Colin Cross 2021-01-22 17:54:22 +00:00 committed by Automerger Merge Worker
commit 6715ce49d5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
glob.go
View file

@ -57,7 +57,8 @@ func (c *Context) glob(pattern string, excludes []string) ([]string, error) {
if exists {
// Glob has already been done, double check it is identical
verifyGlob(fileName, pattern, excludes, g)
return g.Files, nil
// Return a copy so that modifications don't affect the cached value.
return append([]string(nil), g.Files...), nil
}
// Get a globbed file list
@ -76,10 +77,12 @@ func (c *Context) glob(pattern string, excludes []string) ([]string, error) {
// Getting the list raced with another goroutine, throw away the results and use theirs
if exists {
verifyGlob(fileName, pattern, excludes, g)
return g.Files, nil
// Return a copy so that modifications don't affect the cached value.
return append([]string(nil), g.Files...), nil
}
return files, nil
// Return a copy so that modifications don't affect the cached value.
return append([]string(nil), files...), nil
}
func (c *Context) Globs() []GlobPath {