tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pxar: fix missing newlines in warnings

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2020-06-30 14:37:20 +02:00
parent 40b63186a6
commit 5afa0755ea
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pxar/create.rs
View File

@ -263,7 +263,7 @@ impl<'a, 'b> Archiver<'a, 'b> {
Ok(fd) => Ok(Some(fd)), Ok(fd) => Ok(Some(fd)),
Err(nix::Error::Sys(Errno::ENOENT)) => Ok(None), Err(nix::Error::Sys(Errno::ENOENT)) => Ok(None),
Err(nix::Error::Sys(Errno::EACCES)) => { Err(nix::Error::Sys(Errno::EACCES)) => {
write!(self.errors, "failed to open file: {:?}: access denied", file_name)?; writeln!(self.errors, "failed to open file: {:?}: access denied", file_name)?;
Ok(None) Ok(None)
} }
Err(other) => Err(Error::from(other)), Err(other) => Err(Error::from(other)),
@ -287,7 +287,7 @@ impl<'a, 'b> Archiver<'a, 'b> {
let line = match line { let line = match line {
Ok(line) => line, Ok(line) => line,
Err(err) => { Err(err) => {
let _ = write!( let _ = writeln!(
self.errors, self.errors,
"ignoring .pxarexclude after read error in {:?}: {}", "ignoring .pxarexclude after read error in {:?}: {}",
self.path, self.path,
@ -307,7 +307,7 @@ impl<'a, 'b> Archiver<'a, 'b> {
match MatchEntry::parse_pattern(line, PatternFlag::PATH_NAME, MatchType::Exclude) { match MatchEntry::parse_pattern(line, PatternFlag::PATH_NAME, MatchType::Exclude) {
Ok(pattern) => self.patterns.push(pattern), Ok(pattern) => self.patterns.push(pattern),
Err(err) => { Err(err) => {
let _ = write!(self.errors, "bad pattern in {:?}: {}", self.path, err); let _ = writeln!(self.errors, "bad pattern in {:?}: {}", self.path, err);
} }
} }
} }
@ -410,12 +410,12 @@ impl<'a, 'b> Archiver<'a, 'b> {
} }
fn report_vanished_file(&mut self) -> Result<(), Error> { fn report_vanished_file(&mut self) -> Result<(), Error> {
write!(self.errors, "warning: file vanished while reading: {:?}", self.path)?; writeln!(self.errors, "warning: file vanished while reading: {:?}", self.path)?;
Ok(()) Ok(())
} }
fn report_file_shrunk_while_reading(&mut self) -> Result<(), Error> { fn report_file_shrunk_while_reading(&mut self) -> Result<(), Error> {
write!( writeln!(
self.errors, self.errors,
"warning: file size shrunk while reading: {:?}, file will be padded with zeros!", "warning: file size shrunk while reading: {:?}, file will be padded with zeros!",
self.path, self.path,
@ -424,7 +424,7 @@ impl<'a, 'b> Archiver<'a, 'b> {
} }
fn report_file_grew_while_reading(&mut self) -> Result<(), Error> { fn report_file_grew_while_reading(&mut self) -> Result<(), Error> {
write!( writeln!(
self.errors, self.errors,
"warning: file size increased while reading: {:?}, file will be truncated!", "warning: file size increased while reading: {:?}, file will be truncated!",
self.path, self.path,