Merge 589b887 into ad96b00

yast · Jun 26, 2017 · 9201117 · 9201117
2 parents ad96b00 + 589b887
commit 9201117
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/package/yast2-kdump.changes b/package/yast2-kdump.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun 26 15:27:06 CEST 2017 - schubi@suse.de
+
+- Crash in AutoYaST clone: Fix for "dup" while getting
+  crash_xen_kernel_values and crash_kernel_values values.
+  (bnc#1045965)
+- 3.2.7
+
 -------------------------------------------------------------------
 Wed Jun 21 09:10:56 UTC 2017 - gsouza@suse.com
 

diff --git a/package/yast2-kdump.spec b/package/yast2-kdump.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-kdump
-Version:        3.2.6
+Version:        3.2.7
 Release:        0
 Summary:        Configuration of kdump
 License:        GPL-2.0

diff --git a/src/modules/Kdump.rb b/src/modules/Kdump.rb
@@ -1145,7 +1145,11 @@ def crash_kernel_values
       # modification.
       # The old value (ensuring the Array format) will be returned.
       if @crashkernel_list_ranges
-        return Array(@crashkernel_param_values.dup)
+        if @crashkernel_param_values.is_a? Symbol
+          return @crashkernel_param_values
+        else
+          return Array(@crashkernel_param_values.dup)
+        end
       end
 
       result = []
@@ -1173,7 +1177,11 @@ def crash_xen_kernel_values
       # modification.
       # The old value (ensuring the Array format) will be returned.
       if @crashkernel_list_ranges
-        return Array(@crashkernel_xen_param_values.dup)
+        if @crashkernel_xen_param_values.is_a? Symbol
+          return @crashkernel_xen_param_values
+        else
+          return Array(@crashkernel_xen_param_values.dup)
+        end
       end
 
       result = []