Merge branch 'SLE-15-SP1' into external-sources-link-m

yast · May 7, 2019 · 9c0ff06 · 9c0ff06
2 parents 797caed + 68cdde1
commit 9c0ff06
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May  2 12:10:07 UTC 2019 - mvidner@suse.com
+
+- Prefer control.xml to ProductFeatures for Community Repositories
+  (bsc#1132613)
+- 4.2.5
+
 -------------------------------------------------------------------
 Fri Apr 26 08:44:25 UTC 2019 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.2.4
+Version:        4.2.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/y2packager/clients/inst_productsources.rb b/src/lib/y2packager/clients/inst_productsources.rb
@@ -444,27 +444,23 @@ 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 = Ops.get_string(
-          software_features,
-          "external_sources_link",
-          ""
-        )
-      else
-        @main_link = ""
+        @main_link = software_features["external_sources_link"]
       end
-      Builtins.y2milestone("Got link: %1", @main_link)
+      @main_link ||= ""
 
-      if @main_link.nil? || @main_link == ""
-        @main_link = ""
+      if @main_link == ""
         Builtins.y2warning("No link")
         return false
       end
 
       Builtins.y2milestone("Using link: %1", @main_link)
-
-      !@main_link.nil? && @main_link != ""
+      true
     end
 
     def UseDownloadFile