From a4aec56d18943686d300ad0e26f2eefd83f27072 Mon Sep 17 00:00:00 2001 From: Arkadiy Paronyan Date: Mon, 29 May 2017 15:15:54 +0200 Subject: [PATCH] Fixed --datadir option (#5697) * Fixed --datadir * Removed evmbin lib --- evmbin/Cargo.toml | 4 ---- parity/configuration.rs | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/evmbin/Cargo.toml b/evmbin/Cargo.toml index 813c502cd..55defab7b 100644 --- a/evmbin/Cargo.toml +++ b/evmbin/Cargo.toml @@ -4,10 +4,6 @@ description = "Parity's EVM implementation" version = "0.1.0" authors = ["Parity Technologies "] -[lib] -name = "evmbin" -path = "./src/main.rs" - [[bin]] name = "parity-evm" path = "./src/main.rs" diff --git a/parity/configuration.rs b/parity/configuration.rs index 6ac7e3e99..5e5b43a64 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -881,8 +881,8 @@ impl Configuration { use path; let local_path = default_local_path(); - let base_path = self.args.flag_base_path.as_ref().map_or_else(|| default_data_path(), |s| s.clone()); - let data_path = replace_home("", self.args.flag_datadir.as_ref().unwrap_or(&base_path)); + let base_path = self.args.flag_base_path.as_ref().or_else(|| self.args.flag_datadir.as_ref()).map_or_else(|| default_data_path(), |s| s.clone()); + let data_path = replace_home("", &base_path); let base_db_path = if self.args.flag_base_path.is_some() && self.args.flag_db_path.is_none() { // If base_path is set and db_path is not we default to base path subdir instead of LOCAL. "$BASE/chains"