From fa7e957ca3c86aacd49824451a5b930902405444 Mon Sep 17 00:00:00 2001 From: Christian Ebner <c.ebner@proxmox.com> Date: Tue, 16 Jul 2019 18:19:44 +0200 Subject: [PATCH] pxar: Adapt SequentialDecoder::restore() calls to pass empty match pattern for full restore Signed-off-by: Christian Ebner <c.ebner@proxmox.com> --- src/bin/proxmox-backup-client.rs | 2 +- src/client/pxar_decode_writer.rs | 2 +- src/pxar/decoder.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index d100e063..8cac735a 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -739,7 +739,7 @@ fn restore( Ok(()) }); - decoder.restore(Path::new(target))?; + decoder.restore(Path::new(target), &Vec::new())?; } else { let stdout = std::io::stdout(); let mut writer = stdout.lock(); diff --git a/src/client/pxar_decode_writer.rs b/src/client/pxar_decode_writer.rs index 801e6a29..edf2bfdf 100644 --- a/src/client/pxar_decode_writer.rs +++ b/src/client/pxar_decode_writer.rs @@ -38,7 +38,7 @@ impl PxarDecodeWriter { Ok(()) }); - if let Err(err) = decoder.restore(&base) { + if let Err(err) = decoder.restore(&base, &Vec::new()) { eprintln!("pxar decode failed - {}", err); } }); diff --git a/src/pxar/decoder.rs b/src/pxar/decoder.rs index d806e28b..0c767977 100644 --- a/src/pxar/decoder.rs +++ b/src/pxar/decoder.rs @@ -71,7 +71,7 @@ impl <'a, R: Read + Seek, F: Fn(&Path) -> Result<(), Error>> Decoder<'a, R, F> { self.seek(SeekFrom::Start(start))?; - self.inner.restore(path)?; + self.inner.restore(path, &Vec::new())?; Ok(()) }