removed media addons from registratoin workflow (bnc#880507)

- 3.1.72
yast · Jun 12, 2014 · 42c584d · 42c584d
1 parent b39cd4f
commit 42c584d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 12 07:28:51 UTC 2014 - lslezak@suse.cz
+
+- removed media addons from registratoin workflow (bnc#880507)
+- 3.1.73
+
 -------------------------------------------------------------------
 Tue Jun 11 14:22:07 UTC 2014 - jreidinger@suse.com
 

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

diff --git a/src/clients/inst_scc.rb b/src/clients/inst_scc.rb
@@ -529,21 +529,6 @@ def confirm_skipping
       Popup.YesNo(confirmation)
     end
 
-    def media_addons
-      # force displaying the UI
-      Installation.add_on_selected = true
-
-      ret = WFM.call("inst_add-on",
-        [{ "enable_next" => true, "enable_back" => true}]
-      )
-      ret = :next if [:auto, :finish].include?(ret)
-
-      # leave the workflow if registration was skipped
-      ret = :finish if ret == :next && @registration_skipped
-
-      return ret
-    end
-
     def registered_dialog
       VBox(
         Heading(_("The system is already registered.")),
@@ -625,7 +610,6 @@ def start_workflow
         "register"        => lambda { register_base_system() },
         "select_addons"   => lambda { select_addons() },
         "update"          => [ lambda { update_registration() }, true ],
-        "media_addons"    => lambda { media_addons() },
         "addon_eula"      => lambda { addon_eula() },
         "register_addons" => lambda { register_addons() }
       }
@@ -650,18 +634,13 @@ def start_workflow
         "register" => {
           :abort    => :abort,
           :cancel   => :abort,
-          :skip     => "media_addons",
+          :skip     => :next,
           :next     => "select_addons"
         },
         "select_addons" => {
           :abort    => :abort,
-          :skip     => "media_addons",
-          :next     => "media_addons"
-        },
-        "media_addons" => {
-          :abort    => :abort,
-          :next     => "addon_eula",
-          :finish   => :next
+          :skip     => :next,
+          :next     => "addon_eula"
         },
         "addon_eula" => {
           :abort    => :abort,