Merge pull request #19442 from nak3/break-when-config-found

openshift-merge-robot · web-flow · commit d9722e72729a · 2018-04-20T17:11:10.000-07:00
diagnostics: Break a loop when config file found
diff --git a/pkg/oc/admin/diagnostics/config.go b/pkg/oc/admin/diagnostics/config.go
@@ -52,9 +52,10 @@ func (o DiagnosticsOptions) detectClientConfig() (expected bool, detected bool)
 			}
 		}
 
-		if o.canOpenConfigFile(path, errmsg) && len(foundPath) == 0 {
+		if o.canOpenConfigFile(path, errmsg) {
 			successfulLoad = true
 			foundPath = path
+			break
 		}
 	}
 	if len(foundPath) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,10 @@ func (o DiagnosticsOptions) detectClientConfig() (expected bool, detected bool)`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- if o.canOpenConfigFile(path, errmsg) && len(foundPath) == 0 {`
	`55`	`+ if o.canOpenConfigFile(path, errmsg) {`
`56`	`56`	`successfulLoad = true`
`57`	`57`	`foundPath = path`
	`58`	`+ break`
`58`	`59`	`}`
`59`	`60`	`}`
`60`	`61`	`if len(foundPath) > 0 {`