diff options
author | Howard Chu <hyc@symas.com> | 2017-03-03 21:45:14 +0000 |
---|---|---|
committer | Howard Chu <hyc@symas.com> | 2017-03-03 21:45:14 +0000 |
commit | e4437b255132ed6199ab1b314a48d4c60371fc67 (patch) | |
tree | 0b454d57574473f8b4c53ea86a38040feccef290 | |
parent | Merge pull request #1832 (diff) | |
download | monero-e4437b255132ed6199ab1b314a48d4c60371fc67.tar.xz |
Fix double-import
Incomplete ifdef cleanup in 9e82b694da120708652871b55f639d1ef306a7ec
-rw-r--r-- | src/blockchain_utilities/blockchain_import.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/blockchain_utilities/blockchain_import.cpp b/src/blockchain_utilities/blockchain_import.cpp index c91cdb430..83fd6fb20 100644 --- a/src/blockchain_utilities/blockchain_import.cpp +++ b/src/blockchain_utilities/blockchain_import.cpp @@ -762,7 +762,11 @@ int main(int argc, char* argv[]) 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"; } @@ -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 // circumstance. - // for multi_db_runtime: - if (db_type == "lmdb" || db_type == "berkeley") - { - fake_core_db simple_core(m_config_folder, opt_testnet, opt_batch, db_type, db_flags); - import_from_file(simple_core, import_file_path, block_stop); - } - else + if (db_type != "lmdb" +#if defined(BERKELEY_DB) + && db_type != "berkeley" +#endif + ) { std::cerr << "database type unrecognized" << ENDL; return 1; |