Merge pull request #496 from yast/feature/fix-bsc-1125959

Avoid to crash when profile has a not valid sofware section

package/autoyast2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 22 16:40:30 UTC 2019 - dgonzalez@suse.com
+
+- Avoid to crash when the profile has a not valid sofware section
+  (bsc#1125959).
+- 4.1.2
+
 -------------------------------------------------------------------
 Tue Feb 12 13:50:19 CET 2019 - schubi@suse.de
 

package/autoyast2.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.1.1
+Version:        4.1.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/modules/AutoinstFunctions.rb

@@ -136,7 +136,7 @@ def identify_product
     # @return [Y2Packager::Product] a product if exactly one product matches
     # the criteria, nil otherwise
     def identify_product_by_patterns(profile)
-      software = profile.fetch("software", {})
+      software = profile["software"] || {}
 
       identify_product do |product|
         software.fetch("patterns", []).any? { |p| p =~ /#{product.name.downcase}-.*/ }
@@ -151,7 +151,7 @@ def identify_product_by_patterns(profile)
     # @return [Y2Packager::Product] a product if exactly one product matches
     # the criteria, nil otherwise
     def identify_product_by_packages(profile)
-      software = profile.fetch("software", {})
+      software = profile["software"] || {}
 
       identify_product do |product|
         software.fetch("packages", []).any? { |p| p =~ /#{product.name.downcase}-release/ }
@@ -180,7 +180,14 @@ def identify_product_by_selection(profile)
     # @param profile [Hash] AutoYaST profile
     # @return [String] product name
     def base_product_name(profile)
-      software = profile.fetch("software", {})
+      software = profile["software"]
+
+      if software.nil?
+        log.info("Error: given profile has not a valid software section")
+
+        return nil
+      end
+
       software.fetch("products", []).first
     end
   end

test/AutoinstFunctions_test.rb

@@ -176,5 +176,23 @@ def base_product(name)
 
       expect(subject.selected_product.name).to eql "SLED"
     end
+
+    context "when there is not a valid software section" do
+      before do
+        allow(Yast::Profile)
+          .to receive(:current)
+          .and_return("software" => nil)
+      end
+
+      it "returns nil" do
+        expect(subject.selected_product).to be_nil
+      end
+
+      it "logs a message" do
+        expect(subject.log).to receive(:info).at_least(1).with(/not a valid software section/)
+
+        subject.selected_product
+      end
+    end
   end
 end