Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package autoyast2 for openSUSE:Factory 
checked in at 2021-01-19 16:01:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
 and      /work/SRC/openSUSE:Factory/.autoyast2.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "autoyast2"

Tue Jan 19 16:01:04 2021 rev:295 rq:864067 version:4.3.65

Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes      2020-12-15 
12:32:54.900122646 +0100
+++ /work/SRC/openSUSE:Factory/.autoyast2.new.28504/autoyast2.changes   
2021-01-19 16:01:22.667305909 +0100
@@ -1,0 +2,8 @@
+Thu Jan 14 14:38:35 UTC 2021 - Stefan Schubert <sch...@suse.de>
+
+- Upgrade: Checking if a valid base product has been selected for
+  upgrade and if not asking the user to check the product entry
+  in the AY configuration file (bsc#1175876).
+- 4.3.65
+
+-------------------------------------------------------------------

Old:
----
  autoyast2-4.3.64.tar.bz2

New:
----
  autoyast2-4.3.65.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.B0EMts/_old  2021-01-19 16:01:23.495307161 +0100
+++ /var/tmp/diff_new_pack.B0EMts/_new  2021-01-19 16:01:23.499307166 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package autoyast2
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.3.64
+Version:        4.3.65
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

++++++ autoyast2-4.3.64.tar.bz2 -> autoyast2-4.3.65.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-4.3.64/package/autoyast2.changes 
new/autoyast2-4.3.65/package/autoyast2.changes
--- old/autoyast2-4.3.64/package/autoyast2.changes      2020-12-14 
13:17:49.000000000 +0100
+++ new/autoyast2-4.3.65/package/autoyast2.changes      2021-01-18 
13:50:59.000000000 +0100
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Thu Jan 14 14:38:35 UTC 2021 - Stefan Schubert <sch...@suse.de>
+
+- Upgrade: Checking if a valid base product has been selected for
+  upgrade and if not asking the user to check the product entry
+  in the AY configuration file (bsc#1175876).
+- 4.3.65
+
+-------------------------------------------------------------------
 Mon Dec 14 10:16:55 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
 
 - Add support for Btrfs quotas (jsc#SLE-7742).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-4.3.64/package/autoyast2.spec 
new/autoyast2-4.3.65/package/autoyast2.spec
--- old/autoyast2-4.3.64/package/autoyast2.spec 2020-12-14 13:17:49.000000000 
+0100
+++ new/autoyast2-4.3.65/package/autoyast2.spec 2021-01-18 13:50:59.000000000 
+0100
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.3.64
+Version:        4.3.65
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/autoyast2-4.3.64/src/lib/autoinstall/clients/inst_autoinit.rb 
new/autoyast2-4.3.65/src/lib/autoinstall/clients/inst_autoinit.rb
--- old/autoyast2-4.3.64/src/lib/autoinstall/clients/inst_autoinit.rb   
2020-12-14 13:17:49.000000000 +0100
+++ new/autoyast2-4.3.65/src/lib/autoinstall/clients/inst_autoinit.rb   
2021-01-18 13:50:59.000000000 +0100
@@ -134,8 +134,8 @@
            "in the AutoYaST configuration file. " \
            "Please check the <b>products</b> entry in the <b>software</b> 
section.<br><br>" \
            "Following base products are available:<br>")
-          Yast::AutoinstFunctions.available_base_products.each do |product|
-            msg += "#{product.name} (#{product.display_name})<br>"
+          Yast::AutoinstFunctions.available_base_products_hash.each do 
|product|
+            msg += "#{product[:name]} (#{product[:summary]})<br>"
           end
           Yast::Popup.LongError(msg) # No timeout because we are stopping the 
installation/upgrade.
           return :abort
@@ -423,10 +423,8 @@
               "Please check the <b>products</b> entry in the <b>software</b> 
section.<br><br>" \
               "Following base products are available:<br>")
           end
-          Yast::AutoinstFunctions.available_base_products.each do |bp|
-            # FIXME: here we abuse knowledge that base product is 
ProductLocation and not Product
-            # so we access that details which is not available in Product
-            msg += "#{bp.details.product} (#{bp.details.summary})<br>"
+          Yast::AutoinstFunctions.available_base_products_hash.each do |p|
+            msg += "#{p[:name]} (#{p[:summary]})<br>"
           end
           Yast::Popup.LongError(msg) # No timeout because we are stopping the 
installation/upgrade.
           return :abort
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/autoyast2-4.3.64/src/lib/autoinstall/clients/inst_autosetup_upgrade.rb 
new/autoyast2-4.3.65/src/lib/autoinstall/clients/inst_autosetup_upgrade.rb
--- old/autoyast2-4.3.64/src/lib/autoinstall/clients/inst_autosetup_upgrade.rb  
2020-12-14 13:17:49.000000000 +0100
+++ new/autoyast2-4.3.65/src/lib/autoinstall/clients/inst_autosetup_upgrade.rb  
2021-01-18 13:50:59.000000000 +0100
@@ -1,6 +1,7 @@
 require "autoinstall/autosetup_helpers"
 
 require "y2packager/product_upgrade"
+require "yast2/popup"
 
 Yast.import "AddOnProduct"
 Yast.import "Arch"
@@ -227,6 +228,23 @@
         )
 
         #
+        # Checking if at least one base product has been selected/evaluated.
+        #
+        begin
+          Product.FindBaseProducts
+        rescue StandardError
+          msg = _("No new base product has been set.\n" \
+           "It can be specified in the <b>software</b>/<b>products</b> entry 
in the " \
+           "AutoYaST configuration file.<br><br>" \
+           "Following base products are available:<br>")
+          Yast::AutoinstFunctions.available_base_products_hash.each do 
|product|
+            msg += "#{product[:name]} (#{product[:summary]})<br>"
+          end
+          Yast2::Popup.show(msg, richtext: true) # No timeout because we are 
stopping the upgrade.
+          return :abort
+        end
+
+        #
         # Checking Base Product licenses
         #
         Progress.NextStage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-4.3.64/src/modules/AutoinstFunctions.rb 
new/autoyast2-4.3.65/src/modules/AutoinstFunctions.rb
--- old/autoyast2-4.3.64/src/modules/AutoinstFunctions.rb       2020-12-14 
13:17:49.000000000 +0100
+++ new/autoyast2-4.3.65/src/modules/AutoinstFunctions.rb       2021-01-18 
13:50:59.000000000 +0100
@@ -110,6 +110,13 @@
       @selected_product
     end
 
+    #
+    # Evaluate all available base products and returns a list of product.
+    # CAUTION: The type of the return values depend of the kind of where
+    # the product information has been read (libzypp, product location).
+    # So the type could be ProductLocation or Product.
+    # available_base_products_hash could be an alternative for this call.
+    #
     def available_base_products
       @base_products ||= if Y2Packager::MediumType.offline? && !@force_libzypp
         url = InstURL.installInf2Url("")
@@ -122,6 +129,21 @@
       end
     end
 
+    #
+    # Evaluate all available base products and returns a list of hashes which 
contains
+    # human readable strings only.
+    #
+    # @return [Hash] an array of product hashes
+    def available_base_products_hash
+      available_base_products.map do |product|
+        if product.is_a?(Y2Packager::ProductLocation)
+          { name: product.details.product, summary: product.details.summary }
+        else
+          { name: product.name, summary: product.display_name }
+        end
+      end
+    end
+
     # force selected product to be read from libzypp and not from product 
location
     def reset_product
       @selected_product = nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/autoyast2-4.3.64/test/lib/clients/inst_autosetup_upgrade_test.rb 
new/autoyast2-4.3.65/test/lib/clients/inst_autosetup_upgrade_test.rb
--- old/autoyast2-4.3.64/test/lib/clients/inst_autosetup_upgrade_test.rb        
2020-12-14 13:17:49.000000000 +0100
+++ new/autoyast2-4.3.65/test/lib/clients/inst_autosetup_upgrade_test.rb        
2021-01-18 13:50:59.000000000 +0100
@@ -55,6 +55,8 @@
     # would break test expectations
     allow(Yast::WFM).to receive(:SetLanguage)
     allow(Yast::UI).to receive(:SetLanguage)
+    allow(Yast::AutoinstFunctions).to 
receive(:available_base_products).and_return([])
+    allow(Yast::Product).to receive(:FindBaseProducts).and_return([])
   end
 
   describe "#main" do

Reply via email to