Merge branch 'master' into title-left-api

library/packages/src/modules/Product.rb

@@ -93,8 +93,9 @@ def FindBaseProducts
 
       Builtins.y2milestone("Looking for base products")
       products = Pkg.ResolvableProperties("", :product, "")
-      products = Builtins.filter(products) do |p|
-        Ops.get_symbol(p, "status", :none) == :installed
+      expected_status = Stage.initial ? :selected : :installed
+      products = products.select do |p|
+        p["status"] == expected_status
       end
 
       Builtins.y2milestone("All found products: %1", products)
@@ -111,7 +112,7 @@ def FindBaseProducts
             Ops.get_string(p, "display_name", "")
           )
         end
-        Ops.get_string(p, "category", "") == "base"
+        Stage.initial ? (p["source"] == 0) : (p["category"] == "base")
       end
 
       Builtins.y2milestone("Found base products: %1", products)

package/yast2.changes

@@ -1,8 +1,15 @@
 -------------------------------------------------------------------
-Wed Apr  9 13:23:35 UTC 2014 - mvidner@suse.com
+Thu Apr 10 09:06:02 UTC 2014 - mvidner@suse.com
 
 - Enable wizard title on the left instead of on top during the
   installation (bnc#868859).
+- 3.1.43
+
+-------------------------------------------------------------------
+Thu Apr 10 08:04:42 UTC 2014 - jsrain@suse.cz
+
+- adjusted Product.FindBaseProducts to be usable during
+  installation (needed for fix of bnc#871158)
 - 3.1.42
 
 -------------------------------------------------------------------

package/yast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.42
+Version:        3.1.43
 Release:        0
 URL:            https://github.com/yast/yast-yast2