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 561B61FF17E for ; Thu, 13 Nov 2025 12:13:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B055A189B1; Thu, 13 Nov 2025 12:14:19 +0100 (CET) From: Shannon Sterz To: pdm-devel@lists.proxmox.com Date: Thu, 13 Nov 2025 12:13:44 +0100 Message-ID: <20251113111344.219791-1-s.sterz@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763032400057 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.062 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: [pdm-devel] [PATCH datacenter-manager] remote_updates/upgrade-checks: fix old-version being optional X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Signed-off-by: Shannon Sterz --- lib/proxmox-upgrade-checks/src/lib.rs | 4 ++-- server/src/remote_updates.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/proxmox-upgrade-checks/src/lib.rs b/lib/proxmox-upgrade-checks/src/lib.rs index d894f77..c1c0dd9 100644 --- a/lib/proxmox-upgrade-checks/src/lib.rs +++ b/lib/proxmox-upgrade-checks/src/lib.rs @@ -202,9 +202,9 @@ impl UpgradeChecker { .iter() .find(|pkg| pkg.package.as_str() == self.meta_package_name); - if let Some(meta_pkg) = meta_pkg { + if let Some(old_version) = meta_pkg.as_ref().and_then(|m| m.old_version.as_ref()) { let pkg_version = Regex::new(r"^(\d+)\.(\d+)[.-](\d+)")?; - let captures = pkg_version.captures(&meta_pkg.old_version); + let captures = pkg_version.captures(old_version); if let Some(captures) = captures { let maj = Self::extract_version_from_captures(1, &captures)?; let min = Self::extract_version_from_captures(2, &captures)?; diff --git a/server/src/remote_updates.rs b/server/src/remote_updates.rs index b1db3b8..895381a 100644 --- a/server/src/remote_updates.rs +++ b/server/src/remote_updates.rs @@ -287,7 +287,7 @@ fn map_pve_update_info(info: pve_api_types::AptUpdateInfo) -> APTUpdateInfo { arch: info.arch.to_string(), description: info.description, version: info.version, - old_version: info.old_version.unwrap_or_default(), + old_version: info.old_version, origin: info.origin, priority: info.priority, section: info.section, -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel