From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 608BF1FF0B6 for ; Thu, 12 Nov 2026 15:15:25 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id C204D21625; Thu, 12 Nov 2026 15:15:21 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox 16/26] oci: rename ProxmoxOciError to ParseAndExtractTarError Date: Thu, 12 Nov 2026 15:10:43 +0100 Message-ID: <20261112141109.137298-17-f.schauer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261112141109.137298-1-f.schauer@proxmox.com> References: <20261112141109.137298-1-f.schauer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794492918064 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.423 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy ENA_SUBJ_ODD_CASE 1.2 Subject has odd case KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 2GNDKMCDXCLRKIQONJPQ66OCZ5Z7WRXX X-Message-ID-Hash: 2GNDKMCDXCLRKIQONJPQ66OCZ5Z7WRXX X-MailFrom: f.schauer@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Rename `ProxmoxOciError` to `ParseAndExtractTarError` to match `parse_and_extract_tar_image`, in preparation for introducing dedicated error types for other operations. Signed-off-by: Filip Schauer --- proxmox-oci/src/lib.rs | 4 ++-- proxmox-oci/tests/helper/mod.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proxmox-oci/src/lib.rs b/proxmox-oci/src/lib.rs index 5652a50f..672d81e0 100644 --- a/proxmox-oci/src/lib.rs +++ b/proxmox-oci/src/lib.rs @@ -20,7 +20,7 @@ use parse::parse_image; mod oci_tar_image; #[derive(Debug, Error)] -pub enum ProxmoxOciError { +pub enum ParseAndExtractTarError { #[error("Error while parsing OCI image: {0}")] ParseError(#[from] ParseError), #[error("Error while extracting OCI image: {0}")] @@ -47,7 +47,7 @@ pub fn parse_and_extract_tar_image>( rootfs_path: P, os: Option<&Os>, arch: Option<&Arch>, -) -> Result, ProxmoxOciError> { +) -> Result, ParseAndExtractTarError> { let (oci_tar_image, image_manifest, image_config) = parse_image(oci_tar_path, os, arch)?; extract_image_rootfs(oci_tar_image, &image_manifest, &image_config, rootfs_path)?; diff --git a/proxmox-oci/tests/helper/mod.rs b/proxmox-oci/tests/helper/mod.rs index 56e51fda..bd541c9c 100644 --- a/proxmox-oci/tests/helper/mod.rs +++ b/proxmox-oci/tests/helper/mod.rs @@ -5,7 +5,7 @@ use std::path::{Path, PathBuf}; use anyhow::Result; -use proxmox_oci::{Arch, Config, Os, ProxmoxOciError, parse_and_extract_tar_image}; +use proxmox_oci::{Arch, Config, Os, ParseAndExtractTarError, parse_and_extract_tar_image}; use proxmox_sys::fs::make_tmp_dir; mod oci_tar_image_builder; @@ -70,7 +70,7 @@ impl TestImage { }) } - pub fn extract(&self) -> Result, ProxmoxOciError> { + pub fn extract(&self) -> Result, ParseAndExtractTarError> { parse_and_extract_tar_image( &self.path, &self.extract_dir, -- 2.47.3