From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 849CD1FF38E for ; Tue, 28 May 2024 11:43:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5D7E612874; Tue, 28 May 2024 11:44:11 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 28 May 2024 11:42:30 +0200 Message-Id: <20240528094303.309806-37-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240528094303.309806-1-c.ebner@proxmox.com> References: <20240528094303.309806-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v8 proxmox-backup 36/69] pxar: add more context to extraction error X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Show more of the extraction error context provided by the pxar decoder. Signed-off-by: Christian Ebner --- changes since version 7: - no changes changes since version 6: - no changes pxar-bin/src/main.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs index b64ae1d19..17e468062 100644 --- a/pxar-bin/src/main.rs +++ b/pxar-bin/src/main.rs @@ -231,7 +231,8 @@ fn extract_archive( if archive == "-" { let stdin = std::io::stdin(); let mut reader = stdin.lock(); - extract_archive_from_reader(&mut reader, target, feature_flags, options, None)?; + extract_archive_from_reader(&mut reader, target, feature_flags, options, None) + .map_err(|err| format_err!("error extracting archive - {err:#}"))?; } else { log::debug!("PXAR extract: {}", archive); let file = std::fs::File::open(archive)?; @@ -248,7 +249,8 @@ fn extract_archive( feature_flags, options, payload_reader.as_mut(), - )?; + ) + .map_err(|err| format_err!("error extracting archive - {err:#}"))? } if !was_ok.load(Ordering::Acquire) { -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel