[PATCH 1/4 rhel7-branch] Don't catch hwaddr not found exception for ethernet devices (#999514)

Radek Vykydal rvykydal at redhat.com
Mon Aug 26 10:47:14 UTC 2013


Even in context of bz 999514 the exception guard is not needed.

Follow-up of commit 03157477b61d81be870b8af22ba58d11672d12ff
---
 pyanaconda/ui/gui/spokes/advstorage/fcoe.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/advstorage/fcoe.py b/pyanaconda/ui/gui/spokes/advstorage/fcoe.py
index 0a232d3..fa1330c 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/fcoe.py
+++ b/pyanaconda/ui/gui/spokes/advstorage/fcoe.py
@@ -57,13 +57,8 @@ class FCoEDialog(GUIObject):
         self._autoCheckbox = self.builder.get_object("autoCheckbox")
 
         for devname in nm.nm_devices():
-            if not nm.nm_device_type_is_ethernet(devname):
-                continue
-
-            try:
+            if nm.nm_device_type_is_ethernet(devname):
                 self._nicCombo.append_text("%s - %s" % (devname, nm.nm_device_hwaddress(devname)))
-            except ValueError:
-                continue
 
         self._nicCombo.set_active(0)
 
-- 
1.7.11.7



More information about the anaconda-patches mailing list