merged with SLES12-SP2

yast · Jul 27, 2017 · a882d93 · a882d93
2 parents 8dde92a + 19a4a50
commit a882d93
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jul 27 11:12:01 CEST 2017 - schubi@suse.de
+
+- AutoYaST: Configuring EULA acceptance of add-on products has
+  not worked if the add-on product is on the medium of the base
+  product too. (bnc#1032523).
+  Now the add-on product has to be defined in the AutoYaST
+  configuration file explicit.
+- 3.2.15
+
 -------------------------------------------------------------------
 Tue Jul 11 14:41:58 UTC 2017 - lslezak@suse.cz
 
@@ -56,6 +66,7 @@ Tue Mar  7 09:37:15 CET 2017 - schubi@suse.de
   product will not be installed because SLES_SAP already includes
   the SLES product.
   (bnc#1014861)
+<<<<<<< HEAD
 - 3.2.17
 
 -------------------------------------------------------------------
@@ -72,6 +83,9 @@ Mon Feb  6 14:00:13 UTC 2017 - lslezak@suse.cz
 - Do not allow changing services of type "plugin" and its
   repositories, they cannot be changed (related to bsc#1021117)
 - 3.2.15
+=======
+- 3.1.122
+>>>>>>> SLE-12-SP2
 
 -------------------------------------------------------------------
 Wed Feb  1 16:03:24 UTC 2017 - jreidinger@suse.com

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        3.2.24
+Version:        3.2.25
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/Packages.rb b/src/modules/Packages.rb
@@ -43,9 +43,19 @@ class PackagesClass < Module
 
     BASE_PRODUCT_FILE = "/etc/products.d/baseproduct".freeze
 
+    # Some products are already be "included" in other products. So they MUST
+    # not be installed anymore because the other product has a conflict to
+    # that one.
+    PRODUCT_CONFLICTS = {
+      # SLES_SAP contains "Conflicts: sles-release". So SLES will not be installed.
+      # see https://build.suse.de/package/view_file/SUSE:SLE-12-SP2:GA/_product/SLES_SAP-release.spec?expand=1
+      "SLES_SAP" => [ "SLES" ]
+    }
+
     def main
       Yast.import "UI"
       Yast.import "Pkg"
+      Yast.import "Mode"
 
       textdomain "packager"
 
@@ -838,7 +848,13 @@ def InitializeAddOnProducts
           "Found list of add-on products to preselect: %1",
           @add_on_products_list
         )
-        AddOnProduct.AddPreselectedAddOnProducts(@add_on_products_list)
+        if Mode.auto
+          Builtins.y2warning( "This is an AutoYaST installation. "\
+            "Only Add-on products will be added which have been defined "\
+            "in the add-on section of the AutoYaST configuration file." )
+        else
+          AddOnProduct.AddPreselectedAddOnProducts(@add_on_products_list)
+        end
         @add_on_products_list = [] # do not select them any more
       end