Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-10-14 00:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NOD-419] Btcctl parsing error (introduced by NOD-386) (#462)

Browse Source
This commit is contained in:
Dan Aharoni 2019-11-12 14:25:28 +02:00 committed by stasatdaglabs
parent 1f35378a4d
commit 83bad65d3a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/btcctl/config.go
View File

@ -168,7 +168,7 @@ func loadConfig() (*ConfigFlags, []string, error) {
// errors aside from the help message error can be ignored here since // errors aside from the help message error can be ignored here since
// they will be caught by the final parse below. // they will be caught by the final parse below.
preCfg := activeConfig preCfg := activeConfig
preParser := flags.NewParser(&preCfg, flags.HelpFlag) preParser := flags.NewParser(preCfg, flags.HelpFlag)
_, err := preParser.Parse() _, err := preParser.Parse()
if err != nil { if err != nil {
if e, ok := err.(*flags.Error); ok && e.Type == flags.ErrHelp { if e, ok := err.(*flags.Error); ok && e.Type == flags.ErrHelp {
@ -209,7 +209,7 @@ func loadConfig() (*ConfigFlags, []string, error) {
} }
// Load additional config from file. // Load additional config from file.
parser := flags.NewParser(&activeConfig, flags.Default) parser := flags.NewParser(activeConfig, flags.Default)
err = flags.NewIniParser(parser).ParseFile(preCfg.ConfigFile) err = flags.NewIniParser(parser).ParseFile(preCfg.ConfigFile)
if err != nil { if err != nil {
if _, ok := err.(*os.PathError); !ok { if _, ok := err.(*os.PathError); !ok {