network: Catch exception from NM failing to create a bridge device (#…

…1075195) Related: rhbz#1075195
rhinstaller · Sep 29, 2014 · e34747d · e34747d
1 parent 5e63862
commit e34747d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
@@ -1224,9 +1224,9 @@ def apply_kickstart(ksdata):
             for con_uuid, dev_name in added_connections:
                 try:
                     nm.nm_activate_device_connection(dev_name, con_uuid)
-                except nm.UnknownConnectionError:
-                    log.warning("network: pre kickstart: can't activate connection %s on %s",
-                                con_uuid, dev_name)
+                except (nm.UnknownConnectionError, nm.UnknownDeviceError) as e:
+                    log.warning("network: pre kickstart: can't activate connection %s on %s: %s",
+                                con_uuid, dev_name, e)
     return applied_devices
 
 def networkInitialize(ksdata):

diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py
@@ -714,6 +714,8 @@ def nm_activate_device_connection(dev_name, con_uuid):
             raise UnmanagedDeviceError(dev_name, e)
         elif "org.freedesktop.NetworkManager.UnknownConnection" in e.message:
             raise UnknownConnectionError(dev_name, e)
+        if "org.freedesktop.NetworkManager.UnknownDevice" in e.message:
+            raise UnknownDeviceError(dev_name, e)
         raise
 
 def nm_add_connection(values):