[rhel7-branch/master][PATCH] Don't traceback, just log a warning if connection is unavailable (#1070928) v2

Martin Kolman mkolman at redhat.com
Tue Mar 4 11:01:15 UTC 2014


Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
 pyanaconda/network.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index 1b74fb3..e34ba71 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -1152,8 +1152,11 @@ def apply_kickstart_from_pre_section(ksdata):
 
         if network_data.activate:
             for con_uuid, dev_name in added_connections:
-                nm.nm_activate_device_connection(dev_name, con_uuid)
-
+                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))
     return applied_devices
 
 def networkInitialize(ksdata):
-- 
1.8.5.3



More information about the anaconda-patches mailing list