Prefer control.xml to ProductFeatures for community repos (bsc#1132613)

so that /etc/YaST2/ProductFeatures left over from a previous version will not point us to repos for that version
yast · May 2, 2019 · c08927f · c08927f
1 parent cc7b94e
commit c08927f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/lib/y2packager/clients/inst_productsources.rb b/src/lib/y2packager/clients/inst_productsources.rb
@@ -444,6 +444,10 @@ def InitializeSources
     end
 
     def ReadControlFile
+      # Prefer control.xml to /etc/YaST2/ProductFeatures (bsc#1132613)
+      ProductControl.Init
+      # Notably GetSection does not call ProductFeatures.Restore
+      # which would overwrite the ProductControl data we've just read
       software_features = ProductFeatures.GetSection("software")
       if !software_features.nil?
         @main_link = software_features["external_sources_link"]