Merge pull request #1896 from ethcore/fix-geth-2

Autocreating geth dir if none and geth mode on
This commit is contained in:
Robert Habermeier 2016-08-09 22:15:18 +02:00 committed by GitHub
commit 4efddb9c50

View File

@ -511,6 +511,8 @@ impl Configuration {
} }
fn directories(&self) -> Directories { fn directories(&self) -> Directories {
use util::path;
let db_path = replace_home(self.args.flag_datadir.as_ref().unwrap_or(&self.args.flag_db_path)); let db_path = replace_home(self.args.flag_datadir.as_ref().unwrap_or(&self.args.flag_db_path));
let keys_path = replace_home( let keys_path = replace_home(
@ -524,6 +526,12 @@ impl Configuration {
let dapps_path = replace_home(&self.args.flag_dapps_path); let dapps_path = replace_home(&self.args.flag_dapps_path);
let signer_path = replace_home(&self.args.flag_signer_path); let signer_path = replace_home(&self.args.flag_signer_path);
if self.args.flag_geth {
let geth_path = path::ethereum::default();
::std::fs::create_dir_all(geth_path.as_path()).unwrap_or_else(
|e| warn!("Failed to create '{}' for geth mode: {}", &geth_path.to_str().unwrap(), e));
}
Directories { Directories {
keys: keys_path, keys: keys_path,
db: db_path, db: db_path,