Refactoring: BuildDescription

Removed YCP -> Ruby artifacts. Removed nonsence code - ifcfg devmap do not contain dev_name key.
yast · Feb 11, 2014 · 24b1e12 · 24b1e12
1 parent 1a8a611
commit 24b1e12
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/include/network/complex.rb b/src/include/network/complex.rb
@@ -51,18 +51,14 @@ def initialize_network_complex(include_target)
     # Take the NAME field from ifcfg
     # If empty, identify the hardware and use its data
     def BuildDescription(devtype, devnum, devmap, _Hardware)
-      devmap = deep_copy(devmap)
-      _Hardware = deep_copy(_Hardware)
-      descr = Ops.get_string(devmap, "NAME", "")
+      descr = devmap["NAME"] || ""
       return descr if descr != ""
       descr = HardwareName(_Hardware, devnum)
       return descr if descr != ""
-      descr = HardwareName(_Hardware, Ops.get_string(devmap, "UNIQUE", ""))
-      return descr if descr != ""
-      descr = HardwareName(_Hardware, Ops.get_string(devmap, "dev_name", ""))
+      descr = HardwareName(_Hardware, devmap["UNIQUE"] || "")
       return descr if descr != ""
-      descr = CheckEmptyName(devtype, descr)
-      descr
+
+      CheckEmptyName(devtype, descr)
     end
 
     # TODO move to HTML.ycp