From: Gabriel Goller <g.goller@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup] close #5571: client: fix regression for `map` command
Date: Tue, 2 Jul 2024 09:50:17 +0200 [thread overview]
Message-ID: <20240702075017.xdxukvi3mxcd2y6e@luna.proxmox.com> (raw)
In-Reply-To: <20240702072414.91159-1-c.ebner@proxmox.com>
On 02.07.2024 09:24, Christian Ebner wrote:
>Fixes a regression introduced by commit 08fe5052:
>"client: mount: make split pxar archives mountable"
>
>This commit introduced functionality to mount split pxar archives
>(sharing code with the map command), moving the manifest lookup
>exclusive to fixed index archives.
>However, the lookup now uses the incorrect archive name, not
>containing the `.fidx` extension, which is however required for the
>lookup in the manifest.
>
>Fix the issue by calling the method with the correct server archive
>name including the required extension.
>
>Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
>---
> proxmox-backup-client/src/mount.rs | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/proxmox-backup-client/src/mount.rs b/proxmox-backup-client/src/mount.rs
>index d96690839..538a40e68 100644
>--- a/proxmox-backup-client/src/mount.rs
>+++ b/proxmox-backup-client/src/mount.rs
>@@ -302,7 +302,7 @@ async fn mount_do(param: Value, pipe: Option<OwnedFd>) -> Result<Value, Error> {
> }
> }
> } else if server_archive_name.ends_with(".fidx") {
>- let file_info = manifest.lookup_file_info(archive_name)?;
>+ let file_info = manifest.lookup_file_info(&server_archive_name)?;
> let index = client
> .download_fixed_index(&manifest, &server_archive_name)
> .await?;
Works great!
Consider:
Tested-by: Gabriel Goller <g.goller@proxmox.com>
Reviewed-by: Gabriel Goller <g.goller@proxmox.com>
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-07-02 7:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-02 7:24 Christian Ebner
2024-07-02 7:50 ` Gabriel Goller [this message]
2024-07-02 8:13 ` Christian Ebner
2024-07-02 8:44 ` [pbs-devel] applied: " Fabian Grünbichler
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=20240702075017.xdxukvi3mxcd2y6e@luna.proxmox.com \
--to=g.goller@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