From 4e36f7843877298a730cb1de7d1d71c200d80b09 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 8 Jul 2020 08:52:27 +0200 Subject: [PATCH] src/backup/manifest.rs: support old encrypted property Just to avoid confusion. --- src/backup/manifest.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/backup/manifest.rs b/src/backup/manifest.rs index 7aacca12..ec7d3104 100644 --- a/src/backup/manifest.rs +++ b/src/backup/manifest.rs @@ -136,7 +136,17 @@ impl TryFrom for BackupManifest { let csum = required_string_property(item, "csum")?; let csum = proxmox::tools::hex_to_digest(csum)?; let size = required_integer_property(item, "size")? as u64; - let crypt_mode: CryptMode = serde_json::from_value(item["crypt-mode"].clone())?; + + let mut crypt_mode = CryptMode::None; + + if let Some(true) = item["encrypted"].as_bool() { // compatible to < 0.8.0 + crypt_mode = CryptMode::Encrypt; + } + + if let Some(mode) = item.get("crypt-mode") { + crypt_mode = serde_json::from_value(mode.clone())?; + } + manifest.add_file(filename, size, csum, crypt_mode)?; }