monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 10:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1834

Browse source 
e4437b25 Fix double-import (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-03-04 21:14:19 +02:00
commit 734f7c26d5
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/blockchain_utilities/blockchain_import.cpp
View file

@ -762,7 +762,11 @@ int main(int argc, char* argv[])
return 1; return 1;
} }
if ((db_type == "lmdb") || (db_type == "berkeley")) if ((db_type == "lmdb")
#if defined(BERKELEY_DB)
|| (db_type == "berkeley")
#endif
)
{ {
db_engine_compiled = "blockchain_db"; db_engine_compiled = "blockchain_db";
} }
@ -799,13 +803,11 @@ int main(int argc, char* argv[])
// properties to do so. Both ways work, but fake core isn't necessary in that // properties to do so. Both ways work, but fake core isn't necessary in that
// circumstance. // circumstance.
// for multi_db_runtime: if (db_type != "lmdb"
if (db_type == "lmdb" || db_type == "berkeley") #if defined(BERKELEY_DB)
{ && db_type != "berkeley"
fake_core_db simple_core(m_config_folder, opt_testnet, opt_batch, db_type, db_flags); #endif
import_from_file(simple_core, import_file_path, block_stop); )
}
else
{ {
std::cerr << "database type unrecognized" << ENDL; std::cerr << "database type unrecognized" << ENDL;
return 1; return 1;