Merge pull request #691 from imobachgs/fix-filter-config

Do not consider the arch when filtering the config

service/package/rubygem-agama.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug  7 10:52:35 UTC 2023 - Imobach Gonzalez Sosa <[email protected]>
+
+- Do not consider the architecture when filtering the configuration
+  file through the filter-config.rb script (gh#openSUSE/agama#691).
+
 -------------------------------------------------------------------
 Wed Aug  2 10:03:13 UTC 2023 - Imobach Gonzalez Sosa <[email protected]>
 

service/share/filter-config.rb

@@ -41,17 +41,17 @@
   exit(2)
 end
 
-config = Agama::Config.from_file(path)
+config = YAML.load_file(path)
 
-unknown_products = product_ids - config.products.keys
+unknown_products = product_ids - config["products"].keys
 unless unknown_products.empty?
   warn(format("The following products are unknown: %{products}.",
     products: unknown_products.join(", ")))
   exit(3)
 end
 
-keys_to_filter = (["products"] + config.products.keys) - product_ids
-products = product_ids.reduce({}) { |all, id| all.merge(id => config.data["products"][id]) }
+keys_to_filter = (["products"] + config["products"].keys) - product_ids
+products = product_ids.reduce({}) { |all, id| all.merge(id => config["products"][id]) }
 new_config = { "products" => products }
-new_config.merge!(config.pure_data.reject { |k, _v| keys_to_filter.include?(k) })
+new_config.merge!(config.reject { |k, _v| keys_to_filter.include?(k) })
 puts YAML.dump(new_config)