diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index b9f8a7d42..0c042256a 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -68,6 +68,7 @@ usage! { // -- Miscellaneous Options flag_version: bool, + flag_no_config: bool, } { // -- Operating Options diff --git a/parity/cli/usage.rs b/parity/cli/usage.rs index 79f728b41..6ff6c254e 100644 --- a/parity/cli/usage.rs +++ b/parity/cli/usage.rs @@ -125,6 +125,12 @@ macro_rules! usage { pub fn parse>(command: &[S]) -> Result { let raw_args = try!(RawArgs::parse(command)); + + // Skip loading config file if no_config flag is specified + if raw_args.flag_no_config { + return Ok(raw_args.into_args(Config::default())); + } + let config_file = raw_args.flag_config.clone().unwrap_or_else(|| raw_args.clone().into_args(Config::default()).flag_config); let config_file = replace_home(&config_file); let config = match (fs::File::open(&config_file), raw_args.flag_config.is_some()) { diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt index 14673eb2b..1749cd4b7 100644 --- a/parity/cli/usage.txt +++ b/parity/cli/usage.txt @@ -279,6 +279,7 @@ Miscellaneous Options: format as RUST_LOG. (default: {flag_logging:?}) --log-file FILENAME Specify a filename into which logging should be directed. (default: {flag_log_file:?}) + --no-config Don't load a configuration file. --no-color Don't use terminal color codes in output. (default: {flag_no_color}) -v --version Show information about version. -h --help Show this screen.