Compare commits

...

3 Commits

Author SHA1 Message Date
96f35520a0 bump version to 1.0.5-1
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-25 15:30:06 +01:00
490560e0c6 restore: print to STDERR
else restoring to STDOUT is broken..

Reported-by: Dominic Jäger <d.jaeger@proxmox.com>

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2020-11-25 14:38:02 +01:00
52f53d8280 control: update versions 2020-11-25 10:35:51 +01:00
4 changed files with 16 additions and 10 deletions

View File

@ -1,6 +1,6 @@
[package]
name = "proxmox-backup"
version = "1.0.4"
version = "1.0.5"
authors = [
"Dietmar Maurer <dietmar@proxmox.com>",
"Dominik Csapak <d.csapak@proxmox.com>",

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
rust-proxmox-backup (1.0.5-1) unstable; urgency=medium
* client: restore: print meta information exclusively to standard error
-- Proxmox Support Team <support@proxmox.com> Wed, 25 Nov 2020 15:29:58 +0100
rust-proxmox-backup (1.0.4-1) unstable; urgency=medium
* fingerprint: add bytes() accessor

8
debian/control vendored
View File

@ -35,10 +35,10 @@ Build-Depends: debhelper (>= 11),
librust-percent-encoding-2+default-dev (>= 2.1-~~),
librust-pin-project-0.4+default-dev,
librust-pin-utils-0.1+default-dev,
librust-proxmox-0.7+api-macro-dev (>= 0.7.1-~~),
librust-proxmox-0.7+default-dev (>= 0.7.1-~~),
librust-proxmox-0.7+sortable-macro-dev (>= 0.7.1-~~),
librust-proxmox-0.7+websocket-dev (>= 0.7.1-~~),
librust-proxmox-0.7+api-macro-dev (>= 0.7.2-~~),
librust-proxmox-0.7+default-dev (>= 0.7.2-~~),
librust-proxmox-0.7+sortable-macro-dev (>= 0.7.2-~~),
librust-proxmox-0.7+websocket-dev (>= 0.7.2-~~),
librust-proxmox-fuse-0.1+default-dev,
librust-pxar-0.6+default-dev (>= 0.6.1-~~),
librust-pxar-0.6+futures-io-dev (>= 0.6.1-~~),

View File

@ -644,7 +644,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option<Vec<u8>>, 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<Vec<u8>>, 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<Vec<u8>>, 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<Vec<u8>>, 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<Value, Error> {
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)?))
}
};