From 490560e0c63a54adf393132f3507a3f1c43a1af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 25 Nov 2020 14:28:51 +0100 Subject: [PATCH] restore: print to STDERR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit else restoring to STDOUT is broken.. Reported-by: Dominic Jäger Signed-off-by: Fabian Grünbichler --- src/bin/proxmox-backup-client.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index 80b1ff22..372ff268 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -644,7 +644,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option>, CryptMode), Err (None, None) => None, (Some(_), Some(_)) => bail!("--keyfile and --keyfd are mutually exclusive"), (Some(keyfile), None) => { - println!("Using encryption key file: {}", keyfile); + eprintln!("Using encryption key file: {}", keyfile); Some(file_get_contents(keyfile)?) }, (None, Some(fd)) => { @@ -654,7 +654,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option>, CryptMode), Err .map_err(|err| { format_err!("error reading encryption key from fd {}: {}", fd, err) })?; - println!("Using encryption key from file descriptor"); + eprintln!("Using encryption key from file descriptor"); Some(data) } }; @@ -663,7 +663,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option>, CryptMode), Err // no parameters: (None, None) => match key::read_optional_default_encryption_key()? { Some(key) => { - println!("Encrypting with default encryption key!"); + eprintln!("Encrypting with default encryption key!"); (Some(key), CryptMode::Encrypt) }, None => (None, CryptMode::None), @@ -676,7 +676,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option>, CryptMode), Err (None, Some(crypt_mode)) => match key::read_optional_default_encryption_key()? { None => bail!("--crypt-mode without --keyfile and no default key file available"), Some(key) => { - println!("Encrypting with default encryption key!"); + eprintln!("Encrypting with default encryption key!"); (Some(key), crypt_mode) }, } @@ -1257,7 +1257,7 @@ async fn restore(param: Value) -> Result { None => None, Some(key) => { let (key, _, fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?; - println!("Encryption key fingerprint: '{}'", fingerprint); + eprintln!("Encryption key fingerprint: '{}'", fingerprint); Some(Arc::new(CryptConfig::new(key)?)) } };