gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd/swarm: Merge branch 'master' into multiple-ens-endpoints

Browse Source 
Fix a conflict in cmd/swarm envVarsOverride function.
This commit is contained in:
Janos Guljas
2017-12-14 10:35:49 +01:00
parent 19982f9467 3654aeaa4f
commit 47a8014559
30 changed files with 547 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/swarm/config.go
View File

@ -276,7 +276,7 @@ func envVarsOverride(currentConfig *bzzapi.Config) (config *bzzapi.Config) {
}
//EnsAPIs can be set to "", so can't check for empty string, as it is allowed
if ensapi, exists := os.LookupEnv(SWARM_ENV_ENS_API); exists == true {
if ensapi, exists := os.LookupEnv(SWARM_ENV_ENS_API); exists {
ensAPIs := strings.Split(ensapi, ",")
// Disable ENS resolver if SWARM_ENS_API="" is specified
if len(ensAPIs) == 0 {