Merge 05100cd into 9f98a69

yast · Jul 1, 2019 · a6dd2a4 · a6dd2a4
2 parents 9f98a69 + 05100cd
commit a6dd2a4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  1 07:40:05 UTC 2019 - David Diaz <dgonzalez@suse.com>
+
+- Do not abort when an addon license is refused (bsc#1114018).
+- 4.2.1
+
 -------------------------------------------------------------------
 Fri May 31 12:23:30 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>
 

diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-add-on
-Version:        4.2.0
+Version:        4.2.1
 Release:        0
 Summary:        YaST2 - Add-On media installation code
 License:        GPL-2.0-only
@@ -38,8 +38,8 @@ Requires:       autoyast2-installation
 Requires:       yast2 >= 3.0.1
 Requires:       yast2-country
 Requires:       yast2-installation
-# new AddOnProduct.DoInstall argument
-Requires:       yast2-packager >= 4.0.25
+# Packager ProductLicense#HandleLicenseDialogRet allowing "refuse" action
+Requires:       yast2-packager >= 4.2.16
 Requires:       yast2-ruby-bindings >= 1.0.0
 
 Obsoletes:      yast2-add-on-devel-doc

diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb
@@ -1027,6 +1027,9 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
           Wizard.SetTitleIcon("yast-addon")
           ret2 = RunWizard()
 
+          break if ret2 == :back
+          return :abort if ret2 == :abort
+
           log.info "Subworkflow result: ret2: #{ret2}"
 
           if ret2 == :next
@@ -1052,7 +1055,7 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
             # Release all sources after adding a new one
             # because of CD/DVD + url cd://
             Pkg.SourceReleaseAll
-          elsif ret2 == :abort || ret2 == :cancel
+          elsif ret2 == :cancel
             log.info("Aborted, removing add-on repositories: #{@added_repos.inspect}")
 
             # remove the repository