aboutsummaryrefslogtreecommitdiffstats
path: root/eth
diff options
context:
space:
mode:
authorPaweł Bylica <pawel.bylica@imapp.pl>2015-03-03 01:46:55 +0800
committerPaweł Bylica <pawel.bylica@imapp.pl>2015-03-03 01:46:55 +0800
commit24003c76d12b83602ca93be375a3bc19f4fb3f1b (patch)
tree90e77c349df52806d78693f93704b92786fcb693 /eth
parent9c6d9dfc5c9fdd9aeb8f4d9926ed98008b849f2e (diff)
parent65cad14f9b27db396d036f47814d4843d947ac43 (diff)
downloaddexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar.gz
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar.bz2
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar.lz
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar.xz
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.tar.zst
dexon-24003c76d12b83602ca93be375a3bc19f4fb3f1b.zip
Merge remote-tracking branch 'upstream/develop' into evmjit
Diffstat (limited to 'eth')
-rw-r--r--eth/backend.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go
index 0e5d24429..f67f9c78b 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -147,7 +147,8 @@ func New(config *Config) (*Ethereum, error) {
d, _ := db.Get([]byte("ProtocolVersion"))
protov := ethutil.NewValue(d).Uint()
if protov != ProtocolVersion && protov != 0 {
- return nil, fmt.Errorf("Database version mismatch. Protocol(%d / %d). `rm -rf %s`", protov, ProtocolVersion, ethutil.Config.ExecPath+"/database")
+ path := path.Join(config.DataDir, "database")
+ return nil, fmt.Errorf("Database version mismatch. Protocol(%d / %d). `rm -rf %s`", protov, ProtocolVersion, path)
}
// Create new keymanager