diff --git a/parity/cli/config.full.toml b/parity/cli/config.full.toml index ed204e0f3..60571b461 100644 --- a/parity/cli/config.full.toml +++ b/parity/cli/config.full.toml @@ -3,7 +3,7 @@ mode = "last" mode_timeout = 300 mode_alarm = 3600 auto_update = "critical" -releases_track = "current" +release_track = "current" no_download = false no_consensus = false diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index 3ae20be03..1b86faadc 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -86,7 +86,7 @@ usage! { flag_mode_timeout: u64 = 300u64, or |c: &Config| otry!(c.parity).mode_timeout.clone(), flag_mode_alarm: u64 = 3600u64, or |c: &Config| otry!(c.parity).mode_alarm.clone(), flag_auto_update: String = "critical", or |c: &Config| otry!(c.parity).auto_update.clone(), - flag_releases_track: String = "current", or |c: &Config| otry!(c.parity).releases_track.clone(), + flag_release_track: String = "current", or |c: &Config| otry!(c.parity).release_track.clone(), flag_no_download: bool = false, or |c: &Config| otry!(c.parity).no_download.clone(), flag_no_consensus: bool = false, or |c: &Config| otry!(c.parity).no_consensus.clone(), flag_chain: String = "homestead", or |c: &Config| otry!(c.parity).chain.clone(), @@ -314,7 +314,7 @@ struct Operating { mode_timeout: Option, mode_alarm: Option, auto_update: Option, - releases_track: Option, + release_track: Option, no_download: Option, no_consensus: Option, chain: Option, @@ -542,7 +542,7 @@ mod tests { flag_mode_timeout: 300u64, flag_mode_alarm: 3600u64, flag_auto_update: "critical".into(), - flag_releases_track: "current".into(), + flag_release_track: "current".into(), flag_no_download: false, flag_no_consensus: false, flag_chain: "xyz".into(), @@ -720,7 +720,7 @@ mod tests { mode_timeout: Some(15u64), mode_alarm: Some(10u64), auto_update: None, - releases_track: None, + release_track: None, no_download: None, no_consensus: None, chain: Some("./chain.json".into()), diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt index b2f033bfc..baf898ad8 100644 --- a/parity/cli/usage.txt +++ b/parity/cli/usage.txt @@ -40,13 +40,13 @@ Operating Options: critical - Only consensus/security updates. none - No updates will be auto-installed. (default: {flag_auto_update}). - --releases-track TRACK Set which release track we should use for updates. + --release-track TRACK Set which release track we should use for updates. stable - Stable releases. beta - Beta releases. nightly - Nightly releases (unstable). testing - Testing releases (do not use). current - Whatever track this executable was - released on (default: {flag_releases_track}). + released on (default: {flag_release_track}). --no-download Normally new releases will be downloaded ready for updating. This disables it. Not recommended. (default: {flag_no_download}). diff --git a/parity/configuration.rs b/parity/configuration.rs index 57be84dca..9f9cf654e 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -693,7 +693,7 @@ impl Configuration { "all" => UpdateFilter::All, _ => return Err("Invalid value for `--auto-update`. See `--help` for more information.".into()), }, - track: match self.args.flag_releases_track.as_ref() { + track: match self.args.flag_release_track.as_ref() { "stable" => ReleaseTrack::Stable, "beta" => ReleaseTrack::Beta, "nightly" => ReleaseTrack::Nightly,