Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
7b5c3758
Commit
7b5c3758
authored
Aug 09, 2018
by
Anton Evangelatov
Committed by
Péter Szilágyi
Aug 09, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmd/swarm: remove shadow err (#17360)
parent
beade042
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
config.go
cmd/swarm/config.go
+3
-2
No files found.
cmd/swarm/config.go
View file @
7b5c3758
...
...
@@ -132,7 +132,7 @@ func initSwarmNode(config *bzzapi.Config, stack *node.Node, ctx *cli.Context) {
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
)
{
var
err
error
...
...
@@ -142,7 +142,8 @@ func configFileOverride(config *bzzapi.Config, ctx *cli.Context) (*bzzapi.Config
if
filepath
=
ctx
.
GlobalString
(
SwarmTomlConfigPathFlag
.
Name
);
filepath
==
""
{
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
{
return
nil
,
err
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment