[pdm-devel] [PATCH datacenter-manager] remote_updates/upgrade-checks: fix old-version being optional

[Shannon Sterz]

Signed-off-by: Shannon Sterz <s.sterz at proxmox.com>
---
 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