Merge 8dee8c1 into 44b756c

yast · Sep 21, 2018 · bb31382 · bb31382
2 parents 44b756c + 8dee8c1
commit bb31382
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 21 12:58:42 CEST 2018 - schubi@suse.de
+
+- add_on_products.xml : Added tag "confirm_license" to handle
+  Add-On-products licenses which will be added while installation.
+  (bsc#1105758)
+- 4.0.70  
+
 -------------------------------------------------------------------
 Mon Jul 16 11:19:03 UTC 2018 - lslezak@suse.cz
 

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

diff --git a/src/modules/AddOnProduct.rb b/src/modules/AddOnProduct.rb
@@ -1463,6 +1463,15 @@ def AddPreselectedAddOnProducts(filelist)
           priority = one_product.fetch("priority", -1).to_i
           prodname = one_product.fetch("name", "")
           check_name = one_product.fetch("check_name", true)
+          confirm_license = if Mode.auto
+            # Default value in AutoYaST is false.
+            one_product.fetch("confirm_license", false)
+          else
+            # Otherwise it is true.
+            one_product.fetch("confirm_license", true)
+          end
+          Builtins.y2milestone("confirm_license: %1", confirm_license)
+
           # Check URL and setup network if required or prompt to insert CD/DVD
           parsed = URL.Parse(url)
           scheme = parsed.fetch("scheme", "").downcase
@@ -1484,7 +1493,7 @@ def AddPreselectedAddOnProducts(filelist)
             end
           next false unless repo_id
 
-          if !AcceptedLicenseAndInfoFile(repo_id)
+          if confirm_license && !AcceptedLicenseAndInfoFile(repo_id)
             log.warn "License not accepted, delete the repository"
             Pkg.SourceDelete(repo_id)
             next false