diff options
Diffstat (limited to 'sqv')
-rw-r--r-- | sqv/src/sqv-usage.rs | 2 | ||||
-rw-r--r-- | sqv/src/sqv.rs | 4 | ||||
-rw-r--r-- | sqv/src/sqv_cli.rs | 7 | ||||
-rw-r--r-- | sqv/tests/revoked-key.rs | 3 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sqv/src/sqv-usage.rs b/sqv/src/sqv-usage.rs index 8e1cb395..b1fd16d9 100644 --- a/sqv/src/sqv-usage.rs +++ b/sqv/src/sqv-usage.rs @@ -10,8 +10,8 @@ //! //! FLAGS: //! -h, --help Prints help information -//! --trace Trace execution. //! -V, --version Prints version information +//! -v, --verbose Be verbose. //! //! OPTIONS: //! --keyring <FILE>... A keyring. Can be given multiple times. diff --git a/sqv/src/sqv.rs b/sqv/src/sqv.rs index 44dad359..8c68cd0c 100644 --- a/sqv/src/sqv.rs +++ b/sqv/src/sqv.rs @@ -225,7 +225,7 @@ fn real_main() -> Result<()> { let matches = sqv_cli::build().get_matches(); - let trace = matches.is_present("trace"); + let verbose = matches.is_present("verbose"); let good_threshold = if let Some(good_threshold) = matches.value_of("signatures") { @@ -280,7 +280,7 @@ fn real_main() -> Result<()> { let h = v.into_helper(); - if trace { + if verbose { eprintln!("{} of {} signatures are valid (threshold is: {}).", h.good, h.total, good_threshold); } diff --git a/sqv/src/sqv_cli.rs b/sqv/src/sqv_cli.rs index 5d947d47..ee4eebc1 100644 --- a/sqv/src/sqv_cli.rs +++ b/sqv/src/sqv_cli.rs @@ -42,9 +42,10 @@ pub fn build() -> App<'static, 'static> { .arg(Arg::with_name("file").value_name("FILE") .help("File to verify.") .required(true)) - .arg(Arg::with_name("trace") - .help("Trace execution.") - .long("trace")) + .arg(Arg::with_name("verbose") + .help("Be verbose.") + .long("verbose") + .short("v")) .after_help( "TIMESTAMPs must be given in ISO 8601 format \ (e.g. '2017-03-04T13:25:35Z', '2017-03-04T13:25', \ diff --git a/sqv/tests/revoked-key.rs b/sqv/tests/revoked-key.rs index 36fb7457..7b3f1135 100644 --- a/sqv/tests/revoked-key.rs +++ b/sqv/tests/revoked-key.rs @@ -49,8 +49,7 @@ mod integration { Assert::cargo_binary("sqv") .current_dir(path::Path::new("tests").join("data")) .with_args( - &["--trace", - "--keyring", + &["--keyring", &format!("revoked-key-cert-{}.pgp", keyring), &format!("revoked-key-sig-{}.pgp", sig), "msg.txt"]) |