roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/swarm: remove shadow err (#17360)

Browse Source
This commit is contained in:
Anton Evangelatov 2018-08-09 11:37:00 +02:00 committed by Péter Szilágyi
parent beade042d1
commit 7b5c375825
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/swarm/config.go
View File

@ -132,7 +132,7 @@ func initSwarmNode(config *bzzapi.Config, stack *node.Node, ctx *cli.Context) {
log.Debug(printConfig(config)) log.Debug(printConfig(config))
} }
//override the current config with whatever is in the config file, if a config file has been provided //configFileOverride overrides the current config with the config file, if a config file has been provided
func configFileOverride(config *bzzapi.Config, ctx *cli.Context) (*bzzapi.Config, error) { func configFileOverride(config *bzzapi.Config, ctx *cli.Context) (*bzzapi.Config, error) {
var err error var err error
@ -142,7 +142,8 @@ func configFileOverride(config *bzzapi.Config, ctx *cli.Context) (*bzzapi.Config
if filepath = ctx.GlobalString(SwarmTomlConfigPathFlag.Name); filepath == "" { if filepath = ctx.GlobalString(SwarmTomlConfigPathFlag.Name); filepath == "" {
utils.Fatalf("Config file flag provided with invalid file path") utils.Fatalf("Config file flag provided with invalid file path")
} }
f, err := os.Open(filepath) var f *os.File
f, err = os.Open(filepath)
if err != nil { if err != nil {
return nil, err return nil, err
} }