Merge pull request #334 from cwh42/master

Remove autoyast clone button.
yast · Feb 22, 2016 · c5f45c1 · c5f45c1
2 parents e2fe0b6 + 00b80de
commit c5f45c1
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 241 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 17 16:03:56 UTC 2016 - cwh@suse.com
+
+- Remove autoyast clone button (fate#317970) 
+- 3.1.168
+
 -------------------------------------------------------------------
 Thu Dec 22 15:53:34 CET 2015 - schubi@suse.de
 

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

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -10,8 +10,6 @@ module_DATA = \
 client_DATA = \
   clients/cio_ignore_finish.rb \
   clients/cio_ignore_proposal.rb \
-  clients/clone_proposal.rb \
-  clients/clone_finish.rb \
   clients/copy_files_finish.rb \
   clients/copy_logs_finish.rb \
   clients/copy_systemfiles_finish.rb \
@@ -107,7 +105,6 @@ fillup_DATA = \
 ylibdir = "${yast2dir}/lib/installation"
 ylib_DATA = \
   lib/installation/cio_ignore.rb \
-  lib/installation/clone_settings.rb \
   lib/installation/copy_logs_finish.rb \
   lib/installation/minimal_installation.rb \
   lib/installation/prep_shrink.rb \
@@ -118,8 +115,6 @@ ylib_DATA = \
 
 ylibclientdir = "${yast2dir}/lib/installation/clients"
 ylibclient_DATA = \
-  lib/installation/clients/clone_finish.rb \
-  lib/installation/clients/clone_proposal.rb \
   lib/installation/clients/copy_files_finish.rb \
   lib/installation/clients/copy_systemfiles_finish.rb \
   lib/installation/clients/deploy_image_auto.rb \

diff --git a/src/clients/clone_finish.rb b/src/clients/clone_finish.rb
diff --git a/src/clients/clone_proposal.rb b/src/clients/clone_proposal.rb
diff --git a/src/lib/installation/clients/clone_finish.rb b/src/lib/installation/clients/clone_finish.rb
diff --git a/src/lib/installation/clients/clone_proposal.rb b/src/lib/installation/clients/clone_proposal.rb
diff --git a/src/lib/installation/clients/inst_deploy_image.rb b/src/lib/installation/clients/inst_deploy_image.rb
@@ -19,8 +19,6 @@
 # current contact information at www.novell.com.
 # ------------------------------------------------------------------------------
 
-require "installation/clone_settings"
-
 module Yast
   class InstDeployImageClient < Client
     include Yast::Logger
@@ -60,13 +58,6 @@ def main
         end
       end
 
-      if ::Installation::CloneSettings.instance.enabled?
-        log.info "Cloning enabled, storing the current package selection"
-        # store the software selection for AutoYaST for later (bsc#956325)
-        Yast.import "AutoinstSoftware"
-        AutoinstSoftware.SavePackageSelection
-      end
-
       Builtins.y2milestone("Deploying images")
 
       SlideShow.MoveToStage("images")

diff --git a/src/lib/installation/clients/inst_finish.rb b/src/lib/installation/clients/inst_finish.rb
@@ -149,7 +149,6 @@ def main
           "autoinst_scripts1",
           "copy_files",
           "copy_systemfiles",
-          "clone",
           # For live installer only
           Mode.live_installation ? "live_copy_files" : "",
           "switch_scr"

diff --git a/src/lib/installation/clone_settings.rb b/src/lib/installation/clone_settings.rb
diff --git a/src/lib/installation/proposal_runner.rb b/src/lib/installation/proposal_runner.rb
@@ -74,9 +74,6 @@ def run
         return :auto
       end
 
-      args = (Yast::WFM.Args || []).first || {}
-      @hide_export = args["hide_export"]
-
       log.info "Installation step #2"
       @proposal_mode = Yast::GetInstArgs.proposal
 
@@ -210,9 +207,6 @@ def input_loop
           )
           make_proposal(true, false) # force_reset
 
-        when :export_config
-          export_config
-
         when :skip, :dontskip
           handle_skip
 
@@ -247,16 +241,6 @@ def switch_to_tab(input)
       submod_descriptions_and_build_menu
     end
 
-    def export_config
-      path = Yast::UI.AskForSaveFileName("/", "*.xml", _("Location of Stored Configuration"))
-      return unless path
-
-      # force write, so it always write profile even if user do not want
-      # to store profile after installation
-      Yast::WFM.CallFunction("clone_proposal", ["Write", "force" => true, "target_path" => path])
-      raise _("Failed to store configuration. Details can be found in log.") unless File.exist?(path)
-    end
-
     def handle_skip
       if Yast::UI.QueryWidget(Id(:skip), :Value)
         # User doesn't want to use any of the settings
@@ -654,21 +638,14 @@ def skip_buttons
 
     def build_dialog
       headline = @store.headline
+      change_point = Empty()
 
       if Yast::UI.TextMode()
         change_point = ReplacePoint(
           Id(:rep_menu),
           # menu button
           MenuButton(Id(:menu_dummy), _("&Change..."), [Item(Id(:dummy), "")])
-          )
-      elsif @hide_export
-        change_point = Empty()
-      else
-        change_point = PushButton(
-          Id(:export_config),
-          # menu button
-          _("&Export Configuration")
-          )
+        )
       end
 
       # change menu
@@ -778,7 +755,6 @@ def submod_descriptions_and_build_menu
 
       # menu button item
       menu_list << Item(Id(:reset_to_defaults), _("&Reset to defaults"))
-      menu_list << Item(Id(:export_config), _("&Export Configuration")) unless @hide_export
 
       # menu button
       Yast::UI.ReplaceWidget(