[pbs-devel] applied-series: [PATCH proxmox-backup 1/2] pxar: add file name to path_info when applying metadata

[Fabian Grünbichler]

with git trailers folded in, thanks!

Quoting Fabian Grünbichler (2024-10-08 10:33:54)
> else, error messages using this path_info refer to the parent directory instead
> of the actual file entry causing the problem. since this is just for
> informational purposes, lossy conversion is acceptable.
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> ---
> 
> Notes:
>     noticed while preparing patch #2, can/should maybe be applied even if that one isn't ;)
> 
>  pbs-client/src/pxar/extract.rs  | 10 ++++++++--
>  pbs-client/src/pxar/metadata.rs |  8 +++++++-
>  2 files changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs
> index b1245c5fc..c0a1db05d 100644
> --- a/pbs-client/src/pxar/extract.rs
> +++ b/pbs-client/src/pxar/extract.rs
> @@ -724,7 +724,10 @@ impl Extractor {
>              self.feature_flags,
>              metadata,
>              file.as_raw_fd(),
> -            self.dir_stack.path(),
> +            &self
> +                .dir_stack
> +                .path()
> +                .join(file_name.to_string_lossy().to_string()),
>              &mut self.on_error,
>          )
>      }
> @@ -783,7 +786,10 @@ impl Extractor {
>              self.feature_flags,
>              metadata,
>              file.as_raw_fd(),
> -            self.dir_stack.path(),
> +            &self
> +                .dir_stack
> +                .path()
> +                .join(file_name.to_string_lossy().to_string()),
>              &mut self.on_error,
>          )
>      }
> diff --git a/pbs-client/src/pxar/metadata.rs b/pbs-client/src/pxar/metadata.rs
> index 8e7a14312..071547094 100644
> --- a/pbs-client/src/pxar/metadata.rs
> +++ b/pbs-client/src/pxar/metadata.rs
> @@ -72,7 +72,13 @@ pub fn apply_at(
>          Mode::empty(),
>      )?;
>  
> -    apply(flags, metadata, fd.as_raw_fd(), path_info, on_error)
> +    apply(
> +        flags,
> +        metadata,
> +        fd.as_raw_fd(),
> +        &path_info.join(file_name.to_string_lossy().to_string()),
> +        on_error,
> +    )
>  }
>  
>  pub fn apply_initial_flags(
> -- 
> 2.39.5
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel