Do not rescue but just check that the file exist

yast · Feb 6, 2019 · 0009046 · 0009046
1 parent 79a7405
commit 0009046
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb
@@ -2701,14 +2701,11 @@ def export_udevs(devices)
 
           # we already know that kernel device exist, otherwise next above would apply
           # FIXME: It seems that it is not always the case (bsc#1124002)
-          begin
-            portname = ::File.read("/sys/class/net/#{device}/device/portname").strip
-            protocol = ::File.read("/sys/class/net/#{device}/device/protocol").strip
-          rescue SystemCallError => e
-            log.error("Failed to read portname or protocol: #{e.inspect}")
-            portname = ""
-            protocol = ""
-          end
+          portname_file = "/sys/class/net/#{device}/device/portname"
+          portname = ::File.exist? ? ::File.read(portname_file).strip : ""
+
+          protocol_file = "/sys/class/net/#{device}/device/protocol").strip
+          protocol = ::File.exist? ? ::File.read(protocol_file).strip : ""
 
           layer2_ret = SCR.Execute(
             path(".target.bash"),