diff --git a/rust/agama-lib/src/product/settings.rs b/rust/agama-lib/src/product/settings.rs index e474070c0f..b3ab4e882b 100644 --- a/rust/agama-lib/src/product/settings.rs +++ b/rust/agama-lib/src/product/settings.rs @@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize}; #[serde(rename_all = "camelCase")] pub struct ProductSettings { /// ID of the product to install (e.g., "ALP", "Tumbleweed", etc.) - pub product: Option, + pub id: Option, pub registration_code: Option, pub email: Option } diff --git a/rust/agama-lib/src/product/store.rs b/rust/agama-lib/src/product/store.rs index f3f32cf9cc..8014b64ad3 100644 --- a/rust/agama-lib/src/product/store.rs +++ b/rust/agama-lib/src/product/store.rs @@ -25,7 +25,7 @@ impl<'a> ProductStore<'a> { let email = self.product_client.email().await?; Ok(ProductSettings { - product: Some(product), + id: Some(product), registration_code: Some(registration_code), email: Some(email) }) @@ -33,7 +33,7 @@ impl<'a> ProductStore<'a> { pub async fn store(&self, settings: &ProductSettings) -> Result<(), ServiceError> { let mut probe = false; - if let Some(product) = &settings.product { + if let Some(product) = &settings.id { self.product_client.select_product(product).await?; probe = true; } diff --git a/service/lib/agama/software/manager.rb b/service/lib/agama/software/manager.rb index be47087609..e300844709 100644 --- a/service/lib/agama/software/manager.rb +++ b/service/lib/agama/software/manager.rb @@ -244,7 +244,7 @@ def user_patterns=(ids) user_patterns.each { |p| Yast::Pkg.ResolvableNeutral(p, :pattern, force = false) } Yast::PackagesProposal.SetResolvables(PROPOSAL_ID, :pattern, ids) ids.each { |p| Yast::Pkg.ResolvableInstall(p, :pattern) } - logger.info "Setting patterns to #{res.inspect}" + logger.info "Setting patterns to #{ids.inspect}" res = Yast::Pkg.PkgSolve(unused = true) logger.info "Solver run #{res.inspect}"