diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-03 03:13:41 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-03 03:13:41 +0800 |
| commit | af6971f823431e091142dc81f1b252f681d086cf (patch) | |
| tree | 2b34e0f42adaeebcf28c955249934f7dc5270792 /eth | |
| parent | a60a18b080197cad836f18f9d093bba3bcb6cef8 (diff) | |
| parent | 65cad14f9b27db396d036f47814d4843d947ac43 (diff) | |
| download | go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar.gz go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar.bz2 go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar.lz go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar.xz go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.tar.zst go-tangerine-af6971f823431e091142dc81f1b252f681d086cf.zip | |
Merge remote-tracking branch 'upstream/develop' into blockpool2
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go index f6cde5ccd..0de0fcf4a 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -148,7 +148,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 |