From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Fabian Ebner <f.ebner@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] applied series: [PATCH proxmox-backup 1/3] pxar: fix anchored exclusion at archive root
Date: Thu, 12 Nov 2020 11:31:52 +0100 [thread overview]
Message-ID: <20201112103152.pzibada54tneg3wh@olga.proxmox.com> (raw)
In-Reply-To: <20201112090352.9268-1-f.ebner@proxmox.com>
applied series
On Thu, Nov 12, 2020 at 10:03:50AM +0100, Fabian Ebner wrote:
> There is no leading slash in an entry's full_path, causing an anchored
> exclude at the root level to fail, e.g. having "/name" as the content of the
> file archive/root/.pxarexclude didn't match the file archive/root/name
>
> Fix this by prepending a leading slash before matching.
>
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> src/pxar/create.rs | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/pxar/create.rs b/src/pxar/create.rs
> index a16005ce..7c8e3edb 100644
> --- a/src/pxar/create.rs
> +++ b/src/pxar/create.rs
> @@ -443,9 +443,10 @@ impl<'a, 'b> Archiver<'a, 'b> {
> Err(err) => bail!("stat failed on {:?}: {}", full_path, err),
> };
>
> + let match_path = PathBuf::from("/").join(full_path.clone());
> if self
> .patterns
> - .matches(full_path.as_os_str().as_bytes(), Some(stat.st_mode as u32))
> + .matches(match_path.as_os_str().as_bytes(), Some(stat.st_mode as u32))
> == Some(MatchType::Exclude)
> {
> continue;
> --
> 2.20.1
prev parent reply other threads:[~2020-11-12 10:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 9:03 [pbs-devel] " Fabian Ebner
2020-11-12 9:03 ` [pbs-devel] [PATCH proxmox-backup 2/3] pxar: include .pxarexclude files in the archive Fabian Ebner
2020-11-12 9:03 ` [pbs-devel] [PATCH proxmox-backup 3/3] pxar: only generate .pxarexclude-cli if there were CLI parameters Fabian Ebner
2020-11-12 10:22 ` Wolfgang Bumiller
2020-11-12 10:31 ` Wolfgang Bumiller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201112103152.pzibada54tneg3wh@olga.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=f.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox