.

Author: CBenoit

devolutions-agent/src/updater/mod.rs

@@ -28,6 +28,7 @@ use self::product_actions::{ProductUpdateActions, build_product_actions};
 use self::productinfo::DEVOLUTIONS_PRODUCTINFO_URL;
 use self::security::set_file_dacl;
 use crate::config::ConfHandle;
+use crate::updater::productinfo::ProductInfoDb;
 
 pub(crate) use self::error::UpdaterError;
 pub(crate) use self::product::Product;
@@ -261,15 +262,25 @@ async fn check_for_updates(product: Product, update_json: &UpdateJson) -> anyhow
         .await
         .context("failed to download productinfo database")?;
 
-    let parse_result = productinfo::parse_product_info(&product_info_json);
+    let parse_result = ProductInfoDb::parse_product_info(&product_info_json);
 
     let product_info = parse_result
         .db
-        .lookup_msi_for_target_arch(product.get_productinfo_id(), &parse_result.errors)
-        .ok_or_else(|| UpdaterError::ProductFileNotFound {
-            product: product.get_productinfo_id().to_owned(),
-            arch: productinfo::get_target_arch().to_owned(),
-            file_type: "msi".to_owned(),
+        .lookup_current_msi_for_target_arch(product.get_productinfo_id())
+        .ok_or_else(|| {
+            // At this point, log all parsing errors as warnings so we can investigate.
+            for e in parse_result.errors {
+                warn!(
+                    error = format!("{:#}", anyhow::Error::new(e)),
+                    "productinfo.json parsing error"
+                );
+            }
+
+            UpdaterError::ProductFileNotFound {
+                product: product.get_productinfo_id().to_owned(),
+                arch: productinfo::get_target_arch().to_owned(),
+                file_type: "msi".to_owned(),
+            }
         })?;
 
     let remote_version = product_info.version.parse::<DateVersion>()?;