Hello community,

here is the log from the commit of package yast2-installation for 
openSUSE:Factory checked in at 2019-03-14 14:54:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-installation.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-installation"

Thu Mar 14 14:54:11 2019 rev:420 rq:684634 version:4.1.43

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes    
2019-03-10 09:29:39.596261053 +0100
+++ 
/work/SRC/openSUSE:Factory/.yast2-installation.new.28833/yast2-installation.changes
 2019-03-14 14:54:14.959770947 +0100
@@ -1,0 +2,14 @@
+Tue Mar 12 15:48:13 UTC 2019 - David Díaz <[email protected]>
+
+- Update the hard-coded fallback path for licenses directory
+  (fate#324053, jsc#SLE-4173)
+- 4.1.43
+
+-------------------------------------------------------------------
+Fri Mar  8 16:08:48 UTC 2019 - José Iván López González <[email protected]>
+
+- Fix patterns and packages selection when going back to the system
+  role selection (bsc#1126517).
+- 4.1.42
+
+-------------------------------------------------------------------

Old:
----
  yast2-installation-4.1.41.tar.bz2

New:
----
  yast2-installation-4.1.43.tar.bz2

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

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.Fksc67/_old  2019-03-14 14:54:16.011770785 +0100
+++ /var/tmp/diff_new_pack.Fksc67/_new  2019-03-14 14:54:16.015770784 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.1.41
+Version:        4.1.43
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-installation-4.1.41.tar.bz2 -> yast2-installation-4.1.43.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.1.41/package/yast2-installation.changes 
new/yast2-installation-4.1.43/package/yast2-installation.changes
--- old/yast2-installation-4.1.41/package/yast2-installation.changes    
2019-03-07 10:11:42.000000000 +0100
+++ new/yast2-installation-4.1.43/package/yast2-installation.changes    
2019-03-13 10:18:04.000000000 +0100
@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Tue Mar 12 15:48:13 UTC 2019 - David Díaz <[email protected]>
+
+- Update the hard-coded fallback path for licenses directory
+  (fate#324053, jsc#SLE-4173)
+- 4.1.43
+
+-------------------------------------------------------------------
+Fri Mar  8 16:08:48 UTC 2019 - José Iván López González <[email protected]>
+
+- Fix patterns and packages selection when going back to the system
+  role selection (bsc#1126517).
+- 4.1.42
+
+-------------------------------------------------------------------
 Thu Mar  7 08:10:33 UTC 2019 - Ladislav Slezák <[email protected]>
 
 - Retranslate also the side bar steps when changing the language
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.1.41/package/yast2-installation.spec 
new/yast2-installation-4.1.43/package/yast2-installation.spec
--- old/yast2-installation-4.1.41/package/yast2-installation.spec       
2019-03-07 10:11:42.000000000 +0100
+++ new/yast2-installation-4.1.43/package/yast2-installation.spec       
2019-03-13 10:18:04.000000000 +0100
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.1.41
+Version:        4.1.43
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.1.41/src/lib/installation/clients/inst_license.rb 
new/yast2-installation-4.1.43/src/lib/installation/clients/inst_license.rb
--- old/yast2-installation-4.1.41/src/lib/installation/clients/inst_license.rb  
2019-03-07 10:11:42.000000000 +0100
+++ new/yast2-installation-4.1.43/src/lib/installation/clients/inst_license.rb  
2019-03-13 10:18:04.000000000 +0100
@@ -102,7 +102,7 @@
             )
             # fallback - hard-coded
           else
-            @directory = "/etc/YaST2/licenses/base/"
+            @directory = "/usr/share/licenses/product/base/"
             Builtins.y2warning(
               "No 'base_product_license_directory' set, using %1",
               @directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.1.41/src/lib/installation/select_system_role.rb 
new/yast2-installation-4.1.43/src/lib/installation/select_system_role.rb
--- old/yast2-installation-4.1.41/src/lib/installation/select_system_role.rb    
2019-03-07 10:11:42.000000000 +0100
+++ new/yast2-installation-4.1.43/src/lib/installation/select_system_role.rb    
2019-03-13 10:18:04.000000000 +0100
@@ -212,17 +212,31 @@
       role.overlay_features
       adapt_services(role)
 
-      # Reset pkg and pattern selection as many roles define own roles
-      # so ensure when going back that it will properly set (bsc#1088883)
-      reset_patterns
+      select_packages
     end
 
-    def reset_patterns
-      Yast::Pkg::ResolvableProperties("", :pattern, "").each do |pattern|
-        next if pattern["status"] != :selected
-        Yast::Pkg.ResolvableNeutral(pattern["name"], :pattern, false)
-      end
+    # Selects packages for the currently selected role
+    #
+    # Note that everything that was previously selected by the solver needs to 
be reset.
+    # Otherwise, the solver would not select the same list of patterns when 
the same role
+    # is selected again (bsc#1126517).
+    #
+    # Moreover, all patterns should be reset because many roles define their 
own roles, so
+    # the new patterns need to be properly set when going back (bsc#1088883). 
Only patterns
+    # selected by the user should be kept.
+    def select_packages
+      # By default, Packages.Reset resets a resolvable if the resolvable was 
not explicitly
+      # selected by the user. When a resolvable type is given in the parameter 
list, those
+      # resolvables are only reset when they were automatically selected by 
the solver.
+      #
+      # Products, patches, packages and languages are only reset if they were 
automatically
+      # selected by the solver. However, patterns are only kept if they were 
selected by the
+      # user (note that :pattern is not included in the Reset param list).
+      Yast::Packages.Reset([:product, :patch, :package, :language])
+
       Yast::Packages.SelectSystemPatterns(false)
+      Yast::Packages.SelectSystemPackages(false)
+
       Yast::Pkg.PkgSolve(false)
     end
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.1.41/test/select_system_role_test.rb 
new/yast2-installation-4.1.43/test/select_system_role_test.rb
--- old/yast2-installation-4.1.41/test/select_system_role_test.rb       
2019-03-07 10:11:42.000000000 +0100
+++ new/yast2-installation-4.1.43/test/select_system_role_test.rb       
2019-03-13 10:18:04.000000000 +0100
@@ -24,7 +24,9 @@
     before do
       allow(Yast::ProductFeatures).to receive(:ClearOverlay)
       allow(Yast::ProductFeatures).to receive(:SetOverlay)
+      allow(Yast::Packages).to receive(:Reset)
       allow(Yast::Packages).to receive(:SelectSystemPatterns)
+      allow(Yast::Packages).to receive(:SelectSystemPackages)
       allow(Installation::SystemRole).to receive(:current)
     end
 


Reply via email to