From: Wolfgang Bumiller Date: Tue, 30 Jun 2020 12:37:20 +0000 (+0200) Subject: pxar: fix missing newlines in warnings X-Git-Tag: v0.6.0~8 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5afa0755eae33f398c82f10a72ec8cea59346ff4;p=proxmox-backup.git pxar: fix missing newlines in warnings Signed-off-by: Wolfgang Bumiller --- diff --git a/src/pxar/create.rs b/src/pxar/create.rs index a9fbaa69..b3cc12a4 100644 --- a/src/pxar/create.rs +++ b/src/pxar/create.rs @@ -263,7 +263,7 @@ impl<'a, 'b> Archiver<'a, 'b> { Ok(fd) => Ok(Some(fd)), Err(nix::Error::Sys(Errno::ENOENT)) => Ok(None), 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) } Err(other) => Err(Error::from(other)), @@ -287,7 +287,7 @@ impl<'a, 'b> Archiver<'a, 'b> { let line = match line { Ok(line) => line, Err(err) => { - let _ = write!( + let _ = writeln!( self.errors, "ignoring .pxarexclude after read error in {:?}: {}", self.path, @@ -307,7 +307,7 @@ impl<'a, 'b> Archiver<'a, 'b> { match MatchEntry::parse_pattern(line, PatternFlag::PATH_NAME, MatchType::Exclude) { Ok(pattern) => self.patterns.push(pattern), 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> { - write!(self.errors, "warning: file vanished while reading: {:?}", self.path)?; + writeln!(self.errors, "warning: file vanished while reading: {:?}", self.path)?; Ok(()) } fn report_file_shrunk_while_reading(&mut self) -> Result<(), Error> { - write!( + writeln!( self.errors, "warning: file size shrunk while reading: {:?}, file will be padded with zeros!", self.path, @@ -424,7 +424,7 @@ impl<'a, 'b> Archiver<'a, 'b> { } fn report_file_grew_while_reading(&mut self) -> Result<(), Error> { - write!( + writeln!( self.errors, "warning: file size increased while reading: {:?}, file will be truncated!", self.path,