From bb8e9d06c72b5718fd1fac450a45f2a2f5155a44 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 27 Jul 2017 11:43:23 +0200 Subject: [PATCH] eula acceptence moved to add-on procuct client --- package/yast2-packager.changes | 10 ++++++++++ package/yast2-packager.spec | 2 +- src/modules/Packages.rb | 9 ++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes index 13efe98e2..871faa701 100644 --- 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 acception 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.1.123 + ------------------------------------------------------------------- Tue Mar 7 09:37:15 CET 2017 - schubi@suse.de diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec index f30b2cf6e..bc2993827 100644 --- a/package/yast2-packager.spec +++ b/package/yast2-packager.spec @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.122 +Version: 3.1.123 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/src/modules/Packages.rb b/src/modules/Packages.rb index bfced7bd2..f2d189b7f 100644 --- a/src/modules/Packages.rb +++ b/src/modules/Packages.rb @@ -41,6 +41,7 @@ class PackagesClass < Module def main Yast.import "UI" Yast.import "Pkg" + Yast.import "Mode" textdomain "packager" @@ -820,7 +821,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