IsBridgeable: cleanup

yast · Jun 20, 2014 · 0b732d1 · 0b732d1
1 parent c199c1c
commit 0b732d1
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb
@@ -823,10 +823,8 @@ def IsBridgeable(bridgeMaster, itemId)
       devname = GetDeviceName(itemId)
       bonded = BuildBondIndex()
 
-      if bonded[ devname]
-        Builtins.y2debug(
-          "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - is bonded",
-        )
+      if bonded[devname]
+        log.debug("Excluding lan item (#{itemId}: #{devname}) - is bonded")
         return false
       end
 
@@ -835,28 +833,21 @@ def IsBridgeable(bridgeMaster, itemId)
       # exclude forbidden configurations
       case devtype
         when "br"
-          Builtins.y2debug(
-            "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - is bridge",
-          )
+          log.debug("Excluding lan item (#{itemId}: #{devname}) - is bridge")
           return false
+
         when "tun"
-          Builtins.y2debug(
-            "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - is tun",
-          )
+          log.debug("Excluding lan item (#{itemId}: #{devname}) - is tun")
           return false
       end
 
-      case ifcfg[ "STARTMODE"]
+      case ifcfg["STARTMODE"]
         when "nfsroot"
-          Builtins.y2debug(
-            "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - is nfsroot",
-          )
+          log.debug("Excluding lan item (#{itemId}: #{devname}) - is nfsroot")
           return false
 
         when "ifplugd"
-          Builtins.y2debug(
-            "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - ifplugd",
-          )
+          log.debug("Excluding lan item (#{itemId}: #{devname}) - ifplugd")
           return false
 
         else