grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix issues with no test dir present (#2659)

Browse Source
This commit is contained in:
Nikolay Volf 2016-10-18 17:44:40 +03:00 committed by Gav Wood
parent 3c0b02ffe6
commit dba2d79b56
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
parity/configuration.rs
View File

@ -564,10 +564,10 @@ 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 { if self.args.flag_geth && !cfg!(windows) {
let geth_path = path::ethereum::default(); let geth_root = if self.args.flag_testnet { path::ethereum::test() } else { path::ethereum::default() };
::std::fs::create_dir_all(geth_path.as_path()).unwrap_or_else( ::std::fs::create_dir_all(geth_root.as_path()).unwrap_or_else(
|e| warn!("Failed to create '{}' for geth mode: {}", &geth_path.to_str().unwrap(), e)); |e| warn!("Failed to create '{}' for geth mode: {}", &geth_root.to_str().unwrap(), e));
} }
if cfg!(feature = "ipc") && !cfg!(feature = "windows") { if cfg!(feature = "ipc") && !cfg!(feature = "windows") {

7
util/src/path.rs
View File

@ -62,6 +62,13 @@ pub mod ethereum {
/// Default path for ethereum installation on Mac Os /// Default path for ethereum installation on Mac Os
pub fn default() -> PathBuf { super::config_path("Ethereum") } pub fn default() -> PathBuf { super::config_path("Ethereum") }
/// Default path for ethereum installation (testnet)
pub fn test() -> PathBuf {
let mut path = default();
path.push("testnet");
path
}
/// Get the specific folder inside default ethereum installation /// Get the specific folder inside default ethereum installation
pub fn with_default(s: &str) -> PathBuf { pub fn with_default(s: &str) -> PathBuf {
let mut path = default(); let mut path = default();