release

yast · Jan 28, 2014 · b1ce1d5 · b1ce1d5
1 parent c137332
commit b1ce1d5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 28 15:37:15 UTC 2014 - jreidinger@suse.com
+
+- Fix exporting configuration in first stage (FATE#308539)
+- 3.1.25
+
 -------------------------------------------------------------------
 Mon Jan 27 09:56:26 UTC 2014 - mfilka@suse.com
 

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

diff --git a/src/clients/clone_proposal.rb b/src/clients/clone_proposal.rb
@@ -16,8 +16,8 @@ def main
       Yast.import "Installation"
       Yast.import "ProductFeatures"
 
-      func = WFM.Args(0)
-      param = WFM.Args(1)
+      func = WFM.Args[0]
+      param = WFM.Args[1] || {}
 
       product_clone_active = ProductFeatures.GetBooleanFeature(
         "globals",
@@ -71,7 +71,9 @@ def main
           "id"              => CLONE_ACTION_ID
         }
       when "Write"
-        WFM.call "clone_system" if @clone_settings.enabled?
+        if param["force"] || @clone_settings.enabled?
+          WFM.call "clone_system"
+        end
         ret = true
       else
         raise "Unsuported action #{func}"

diff --git a/src/clients/inst_proposal.rb b/src/clients/inst_proposal.rb
@@ -220,7 +220,7 @@ def main
           path = UI.AskForSaveFileName("/", "*.xml", _("Location of Stored Configuration"))
           next unless path
 
-          WFM.CallFunction("clone_proposal", ["Write"])
+          WFM.CallFunction("clone_proposal", ["Write", "force" => true])
           if !File.exists?("/root/autoinst.xml")
             raise _("Failed to store configuration. Details can be found in log.")
           end