Merge "[FAB-9974] Configtxgen recover profile not found panic"

hyperledger · May 10, 2018 · 4ecb0d3 · 4ecb0d3
2 parents a9e29b3 + 4ca80aa
commit 4ecb0d3
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/common/tools/configtxgen/main.go b/common/tools/configtxgen/main.go
@@ -241,10 +241,16 @@ func main() {
  if err := recover(); err != nil {
  if strings.Contains(fmt.Sprint(err), "Error reading configuration: Unsupported Config Type") {
  logger.Error("Could not find configtx.yaml. " +
- "Please make sure that FABRIC_CFG_PATH is set to a path " +
+ "Please make sure that FABRIC_CFG_PATH or --configPath is set to a path " +
  "which contains configtx.yaml")
  os.Exit(1)
  }
+ if strings.Contains(fmt.Sprint(err), "Could not find profile") {
+ logger.Error(fmt.Sprint(err) + ". " +
+ "Please make sure that FABRIC_CFG_PATH or --configPath is set to a path " +
+ "which contains configtx.yaml with the specified profile")
+ os.Exit(1)
+ }
  logger.Panic(err)
  }
  }()