remove checkbox workaround as it is now handled by yast2-add-on itself

yast · Jun 3, 2014 · 4588938 · 4588938
1 parent 8992c62
commit 4588938
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -33,7 +33,7 @@ Requires:       yast2-pkg-bindings >= 2.17.20
 Requires:       yast2-ruby-bindings >= 3.1.12
 Requires:       rubygem-suse-connect >= 0.0.16
 Requires:       yast2-slp >= 3.1.2
-Requires:       yast2-add-on >= 3.1.3
+Requires:       yast2-add-on >= 3.1.8
 Requires:       yast2-packager >= 3.1.21
 
 BuildRequires:  yast2 >= 3.1.26

diff --git a/src/clients/inst_scc.rb b/src/clients/inst_scc.rb
@@ -619,18 +619,13 @@ def confirm_skipping
     def media_addons
       # force displaying the UI
       Installation.add_on_selected = true
-      # display global enable/disable switch
-      SourceDialogs.display_addon_checkbox = true
 
       ret = WFM.call("inst_add-on",
         [{ "enable_next" => true, "enable_back" => true}]
       )
-      ret = :next if [:auto, :finish].include? ret
+      ret = :next if [:auto, :finish].include?(ret)
 
       return ret
-    ensure
-      # make sure to revert the change if something goes wrong
-      SourceDialogs.display_addon_checkbox = false
     end
 
     def registered_dialog