From befd95a90acc06b22c36128318456ca88ad9bdef Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 9 Feb 2021 13:01:15 +0100 Subject: [PATCH] pxar: improve error messages Signed-off-by: Wolfgang Bumiller --- src/pxar/extract.rs | 6 ++++-- src/pxar/metadata.rs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pxar/extract.rs b/src/pxar/extract.rs index 9cf3f928..0a61c885 100644 --- a/src/pxar/extract.rs +++ b/src/pxar/extract.rs @@ -403,7 +403,8 @@ impl Extractor { metadata, file.as_raw_fd(), &mut self.on_error, - )?; + ) + .map_err(|err| format_err!("failed to apply initial flags: {}", err))?; let extracted = io::copy(&mut *contents, &mut file) .map_err(|err| format_err!("failed to copy file contents: {}", err))?; @@ -445,7 +446,8 @@ impl Extractor { metadata, file.as_raw_fd(), &mut self.on_error, - )?; + ) + .map_err(|err| format_err!("failed to apply initial flags: {}", err))?; let extracted = tokio::io::copy(&mut *contents, &mut file) .await diff --git a/src/pxar/metadata.rs b/src/pxar/metadata.rs index 6e87db3d..4992cc8f 100644 --- a/src/pxar/metadata.rs +++ b/src/pxar/metadata.rs @@ -385,7 +385,7 @@ fn apply_flags(flags: Flags, fd: RawFd, entry_flags: u64) -> Result<(), Error> { match unsafe { fs::write_fat_attr_fd(fd, &fatattr) } { Ok(_) => (), Err(nix::Error::Sys(errno)) if errno_is_unsupported(errno) => (), - Err(err) => bail!("failed to set file attributes: {}", err), + Err(err) => bail!("failed to set file FAT attributes: {}", err), } }