From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9D0D01FF16E for ; Mon, 9 Dec 2024 13:46:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0CCB81CE4; Mon, 9 Dec 2024 13:46:41 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Mon, 9 Dec 2024 13:45:57 +0100 Message-ID: <20241209124601.1272122-5-c.heiss@proxmox.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241209124601.1272122-1-c.heiss@proxmox.com> References: <20241209124601.1272122-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH installer 4/6] common: setup: include path in error message if file could not be read X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Makes it a bit easier to figure out what went wrong in the error case. Signed-off-by: Christoph Heiss --- proxmox-installer-common/src/setup.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/proxmox-installer-common/src/setup.rs b/proxmox-installer-common/src/setup.rs index c3004bc..0ef47d2 100644 --- a/proxmox-installer-common/src/setup.rs +++ b/proxmox-installer-common/src/setup.rs @@ -187,22 +187,28 @@ pub fn load_installer_setup_files( let mut path = runtime_dir.as_ref().to_path_buf(); path.push("iso-info.json"); - read_json(&path).map_err(|err| format!("Failed to retrieve setup info: {err}"))? + read_json(&path) + .map_err(|err| format!("Failed to retrieve setup info: {}: {err}", path.display()))? }; let locale_info = { let mut path = installer_info.locations.lib.clone(); path.push("locale-info.json"); - read_json(&path).map_err(|err| format!("Failed to retrieve locale info: {err}"))? + read_json(&path) + .map_err(|err| format!("Failed to retrieve locale info: {}: {err}", path.display()))? }; let mut runtime_info: RuntimeInfo = { let mut path = runtime_dir.as_ref().to_path_buf(); path.push("run-env-info.json"); - read_json(&path) - .map_err(|err| format!("Failed to retrieve runtime environment info: {err}"))? + read_json(&path).map_err(|err| { + format!( + "Failed to retrieve runtime environment info: {}: {err}", + path.display() + ) + })? }; runtime_info.disks.sort(); -- 2.47.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel