Merge pull request #60 from yast/merge_SLE-15-GA

Merge SLE-15-GA into master
yast · Aug 27, 2018 · 1099351 · 1099351
2 parents 17b23e3 + d5f5ecd
commit 1099351
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 24 deletions.
diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 27 07:03:03 UTC 2018 - knut.anderssen@suse.com
+
+- Do not show the main dialog when it is immediately skipped
+  (bsc#1102705)
+- 4.1.3
+
 -------------------------------------------------------------------
 Mon Aug 20 12:35:51 CEST 2018 - schubi@suse.de
 

diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-add-on
-Version:        4.1.2
+Version:        4.1.3
 Release:        0
 Summary:        YaST2 - Add-On media installation code
 License:        GPL-2.0-only

diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb
@@ -930,20 +930,22 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
 
       # FATE #301928 - Saving one click
       # Bugzilla #893103 be consistent, so always when there is no add-on skip
+      # Bugzilla #1102705 Do not redraw when skipping
       if no_addons
         Builtins.y2milestone("Skipping to media_select")
         ret = :skip_to_add
+      else
+        # Show Add-Ons table
+        Redraw(
+          enable_back,
+          enable_next,
+          enable_abort,
+          back_button,
+          next_button,
+          abort_button
+        )
       end
 
-      # Show Add-Ons table
-      Redraw(
-        enable_back,
-        enable_next,
-        enable_abort,
-        back_button,
-        next_button,
-        abort_button
-      )
 
       # store the initial settings, only once
       WorkflowManager.SetBaseWorkflow(false)
@@ -1039,6 +1041,19 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
             some_addon_changed = true
             # do not keep first_time, otherwise summary won't be shown during installation
             ret = nil if ret == :skip_to_add
+
+            Redraw(
+              enable_back,
+              enable_next,
+              enable_abort,
+              back_button,
+              next_button,
+              abort_button
+            )
+            # bugzilla #293428
+            # Release all sources after adding a new one
+            # because of CD/DVD + url cd://
+            Pkg.SourceReleaseAll
           elsif ret2 == :abort || ret2 == :cancel
             log.info("Aborted, removing add-on repositories: #{@added_repos.inspect}")
 
@@ -1058,20 +1073,6 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
             ret = :back if ret2 == :back
             ret = :next if ret2 == :skip
           end
-
-          Redraw(
-            enable_back,
-            enable_next,
-            enable_abort,
-            back_button,
-            next_button,
-            abort_button
-          )
-
-          # bugzilla #293428
-          # Release all sources after adding a new one
-          # because of CD/DVD + url cd://
-          Pkg.SourceReleaseAll
         end
       end until [:next, :back, :abort].include?(ret)