From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Fabian Ebner <f.ebner@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] applied: [PATCH proxmox-backup] pxar: avoid including archive root's exclude patterns in .pxarexclude-cli
Date: Thu, 12 Nov 2020 13:05:45 +0100 [thread overview]
Message-ID: <20201112120545.23sm3ldmvzt5qcox@olga.proxmox.com> (raw)
In-Reply-To: <20201112113806.8083-1-f.ebner@proxmox.com>
applied
On Thu, Nov 12, 2020 at 12:38:06PM +0100, Fabian Ebner wrote:
> The patterns from the archive root's .pxarexclude file are already present in
> self.patterns when encode_pxarexclude_cli is called. Pass along the number of
> CLI patterns and slice accordingly.
>
> Suggested-By: Wolfgang Bumiller <w.bumiller@proxmox.com>
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>
> Follow-up for:
> https://lists.proxmox.com/pipermail/pbs-devel/2020-November/001509.html
>
> src/pxar/create.rs | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/pxar/create.rs b/src/pxar/create.rs
> index c907a8e0..cc28a79d 100644
> --- a/src/pxar/create.rs
> +++ b/src/pxar/create.rs
> @@ -255,7 +255,7 @@ impl<'a, 'b> Archiver<'a, 'b> {
> let file_name = file_entry.name.to_bytes();
>
> if is_root && file_name == b".pxarexclude-cli" {
> - self.encode_pxarexclude_cli(encoder, &file_entry.name)?;
> + self.encode_pxarexclude_cli(encoder, &file_entry.name, old_patterns_count)?;
> continue;
> }
>
> @@ -387,8 +387,9 @@ impl<'a, 'b> Archiver<'a, 'b> {
> &mut self,
> encoder: &mut Encoder,
> file_name: &CStr,
> + patterns_count: usize,
> ) -> Result<(), Error> {
> - let content = generate_pxar_excludes_cli(&self.patterns);
> + let content = generate_pxar_excludes_cli(&self.patterns[..patterns_count]);
>
> if let Some(ref mut catalog) = self.catalog {
> catalog.add_file(file_name, content.len() as u64, 0)?;
> --
> 2.20.1
prev parent reply other threads:[~2020-11-12 12:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 11:38 [pbs-devel] " Fabian Ebner
2020-11-12 12:05 ` 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=20201112120545.23sm3ldmvzt5qcox@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