Show an error when not installable product is found

yast · Sep 5, 2017 · ad31997 · ad31997
1 parent c074a74
commit ad31997
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 10 deletions.
diff --git a/src/lib/y2packager/clients/inst_repositories_initialization.rb b/src/lib/y2packager/clients/inst_repositories_initialization.rb
@@ -37,15 +37,22 @@ class InstRepositoriesInitialization
       def main
         textdomain "installation"
 
-        if init_installation_repositories
-          adjust_base_product_selection
-          :next
-        else
-          Yast::Popup.Message(
+        if !init_installation_repositories
+          Yast::Popup.Error(
             _("Failed to initialize the software repositories.\nAborting the installation.")
           )
-          :abort
+          return :abort
         end
+
+        if products.empty?
+          Yast::Popup.Error(
+            _("Unable to find base products to install.\nAborting the installation.")
+          )
+          return :abort
+        end
+
+        adjust_base_product_selection
+        :next
       end
 
     private
@@ -71,8 +78,15 @@ def init_installation_repositories
       #
       # See https://github.com/yast/yast-packager/blob/7e1a0bbb90823b03c15d92f408036a560dca8aa3/src/modules/Packages.rb#L1876
       def adjust_base_product_selection
-        products = Y2Packager::Product.available_base_products
-        products.each(&:restore) if products.size > 1
+        return unless products.size > 1
+        products.each(&:restore)
+      end
+
+      # Return base available products
+      #
+      # @return [Array<Y2Product>] Available base products
+      def products
+        @products ||= Y2Packager::Product.available_base_products
       end
     end
   end

diff --git a/src/lib/y2packager/product_reader.rb b/src/lib/y2packager/product_reader.rb
@@ -77,6 +77,7 @@ def self.available_products
 
     def self.installation_package_mapping
       installation_packages = Yast::Pkg.PkgQueryProvides("system-installation()")
+      log.info "Installation packages: #{installation_packages.inspect}"
 
       mapping = {}
       installation_packages.each do |list|

diff --git a/test/lib/clients/inst_repositories_initialization_test.rb b/test/lib/clients/inst_repositories_initialization_test.rb
@@ -9,7 +9,7 @@
   let(:success) { true }
   let(:prod1) { instance_double(Y2Packager::Product) }
   let(:prod2) { instance_double(Y2Packager::Product) }
-  let(:products) { [] }
+  let(:products) { [prod1] }
 
   describe "#main" do
     before do
@@ -36,7 +36,7 @@
       end
 
       it "shows an error" do
-        expect(Yast::Popup).to receive(:Message)
+        expect(Yast::Popup).to receive(:Error)
         client.main
       end
     end
@@ -59,5 +59,18 @@
         client.main
       end
     end
+
+    context "when no products are found" do
+      let(:products) { [] }
+
+      it "returns :abort" do
+        expect(client.main).to eq(:abort)
+      end
+
+      it "shows an error" do
+        expect(Yast::Popup).to receive(:Error)
+        client.main
+      end
+    end
   end
 end