proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-08-07 20:04:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shorten code a tiny bit

Browse Source 
Ends up with a rather long pattern guard but does avoid the return
case duplication...

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2023-08-17 14:03:52 +02:00
parent 70bca12324
commit a9f5360b82
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pbs-client/src/pxar/extract.rs
View File

@ -565,10 +565,9 @@ impl Extractor {
match nix::unistd::symlinkat(link, Some(parent), file_name) { match nix::unistd::symlinkat(link, Some(parent), file_name) {
Ok(()) => {} Ok(()) => {}
Err(err @ nix::errno::Errno::EEXIST) => { Err(nix::errno::Errno::EEXIST)
if !self.overwrite_flags.contains(OverwriteFlags::SYMLINK) { if self.overwrite_flags.contains(OverwriteFlags::SYMLINK) =>
return Err(err.into()); {
}
// Never unlink directories // Never unlink directories
let flag = nix::unistd::UnlinkatFlags::NoRemoveDir; let flag = nix::unistd::UnlinkatFlags::NoRemoveDir;
nix::unistd::unlinkat(Some(parent), file_name, flag)?; nix::unistd::unlinkat(Some(parent), file_name, flag)?;
@ -605,10 +604,9 @@ impl Extractor {
match dolink() { match dolink() {
Ok(()) => {} Ok(()) => {}
Err(err @ nix::errno::Errno::EEXIST) => { Err(nix::errno::Errno::EEXIST)
if !self.overwrite_flags.contains(OverwriteFlags::HARDLINK) { if self.overwrite_flags.contains(OverwriteFlags::HARDLINK) =>
return Err(err.into()); {
}
// Never unlink directories // Never unlink directories
let flag = nix::unistd::UnlinkatFlags::NoRemoveDir; let flag = nix::unistd::UnlinkatFlags::NoRemoveDir;
nix::unistd::unlinkat(Some(parent), file_name, flag)?; nix::unistd::unlinkat(Some(parent), file_name, flag)?;