github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84108 from yutedz/verify-dep-close

Browse Source 
Close the file after reading in verifydependencies#main
This commit is contained in:
Kubernetes Prow Robot 2019-10-21 06:43:38 -07:00 committed by GitHub
commit 0f834b69a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cmd/verifydependencies/verifydependencies.go
View File

@ -72,23 +72,26 @@ func main() {
for _, dep := range externalDeps.Dependencies {
for _, refPath := range dep.RefPaths {
file, err := os.Open(refPath.Path)
if err != nil {
log.Fatalf("error opening file %v : %v", refPath.Path, err)
}
matcher := regexp.MustCompile(refPath.Match)
depFileScanner := bufio.NewScanner(file)
var found bool
for depFileScanner.Scan() {
line := depFileScanner.Text()
if matcher.MatchString(line) && strings.Contains(line, dep.Version) {
found = true
break
func() {
file, err := os.Open(refPath.Path)
if err != nil {
log.Fatalf("error opening file %v : %v", refPath.Path, err)
}
}
if !found {
pathsToUpdate = append(pathsToUpdate, refPath.Path)
}
defer file.Close()
matcher := regexp.MustCompile(refPath.Match)
depFileScanner := bufio.NewScanner(file)
var found bool
for depFileScanner.Scan() {
line := depFileScanner.Text()
if matcher.MatchString(line) && strings.Contains(line, dep.Version) {
found = true
break
}
}
if !found {
pathsToUpdate = append(pathsToUpdate, refPath.Path)
}
}()
}
if len(pathsToUpdate) > 0 {
log.Fatalf(mismatchErrorMessage, externalDepsFilePath, dep.Name, dep.Version, strings.Join(pathsToUpdate, "\n"), dep.Name, externalDepsFilePath)