Merge pull request #32 from yast/review_150702_bnc_936112

[Review] Request from 'schubi2' @ 'yast/yast-s390/review_150702_bnc_936112'
yast · Jul 2, 2015 · 25c78f3 · 25c78f3
2 parents c1022bb + cd87726
commit 25c78f3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/package/yast2-s390.changes b/package/yast2-s390.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul  2 14:56:29 CEST 2015 - schubi@suse.de
+
+- Formating DASD: taking the device name instead of the map entry.
+  (bnc#936112)
+- 3.1.23
+
 -------------------------------------------------------------------
 Wed May 27 14:05:25 CEST 2015 - schubi@suse.de
 

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

diff --git a/src/modules/DASDController.rb b/src/modules/DASDController.rb
@@ -148,9 +148,8 @@ def Write
             to_reactivate << device
           end
           if format
-            device["dev_name"] = GetDeviceName(channel) unless device["dev_name"]
-            to_format << device
-          # unformtted disk, manual (not AutoYaS)
+            to_format << (device["dev_name"] || GetDeviceName(channel))
+          # unformtted disk, manual (not AutoYaST)
           elsif act_ret == 8
             unformatted_devices << device
           end
@@ -631,7 +630,7 @@ def FormatDisks(disks_list, par)
       Builtins.foreach(disks_list) do |device|
         index = Ops.add(index, 1)
         Ops.set(disks, index, device)
-        disks_cmd = Builtins.add(disks_cmd, Builtins.sformat("-f '%1'", device["dev_name"]))
+        disks_cmd = Builtins.add(disks_cmd, Builtins.sformat("-f '%1'", device))
       end
       disks_param = Builtins.mergestring(disks_cmd, " ")
       command = Builtins.sformat(