[FAB-2824] Incorrect configtx.yaml selected

pkpfr · pkpfr · commit a906ace96ae5 · 2017-03-27T15:43:26.000+08:00
When using configtxgen locally, the configtx.yaml from the source
folder will always be selected even if Orderer or Peer config
paths are specified.

For loop in localconfig/congif.go is not exited when a valid config
path is found. This is inconsistent with how it is handled in
provisional/provisional.go.

Change-Id: I3d00b713fedc059e4a10de0e0197d4db3d3826c2
Signed-off-by: Nick Murray &lt;nick@passkit.com&gt;
diff --git a/common/configtx/tool/localconfig/config.go b/common/configtx/tool/localconfig/config.go
@@ -196,6 +196,7 @@ func Load(profile string) *Profile {
 		}
 		cfgPath = path
 		logger.Infof("Found %s there", configFileName)
+		break
 	}
 
 	if cfgPath == "" {

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,7 @@ func Load(profile string) *Profile {`
`196`	`196`	`}`
`197`	`197`	`cfgPath = path`
`198`	`198`	`logger.Infof("Found %s there", configFileName)`
	`199`	`+ break`
`199`	`200`	`}`
`200`	`201`
`201`	`202`	`if cfgPath == "" {`