From 6b8a97ed44ec211397deb70038818e52015c9783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Thu, 21 Nov 2019 12:34:28 +0000 Subject: [PATCH 1/2] Fix the sub-workflow user input handling Propagating :back correctly the main workflow --- src/include/add-on/add-on-workflow.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb index 6ebcd4c..254301f 100644 --- a/src/include/add-on/add-on-workflow.rb +++ b/src/include/add-on/add-on-workflow.rb @@ -1025,9 +1025,10 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next Pkg.SourceReleaseAll Wizard.SetTitleIcon("yast-addon") + ret2 = RunWizard() - break if ret2 == :back + ret = ret2 if ret2 == :back return :abort if ret2 == :abort log.info "Subworkflow result: ret2: #{ret2}" From 44a9d5b94cd54b18043339fba84eff905825b500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Thu, 21 Nov 2019 12:37:17 +0000 Subject: [PATCH 2/2] Update version and changelog --- package/yast2-add-on.changes | 6 ++++++ package/yast2-add-on.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes index 7ffabf8..dd90e8d 100644 --- a/package/yast2-add-on.changes +++ b/package/yast2-add-on.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 21 12:36:10 UTC 2019 - David Diaz + +- Handle correctly the user input when going back (bsc#1156528) +- 4.1.14 + ------------------------------------------------------------------- Mon Jul 1 07:40:05 UTC 2019 - David Diaz diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec index f88784c..d409fa8 100644 --- a/package/yast2-add-on.spec +++ b/package/yast2-add-on.spec @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.1.13 +Version: 4.1.14 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only