From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Wed, 21 Oct 2009 15:42:34 +0000 (+0000)
Subject: wrap open() with try/except
X-Git-Tag: NodeManager-1.8-18~3
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=58f46637398bc93da425c7bde56159bc066e1e2b

wrap open() with try/except
---

diff --git a/tools.py b/tools.py
index 941838b..122b321 100644
--- a/tools.py
+++ b/tools.py
@@ -18,18 +18,21 @@ def get_default_if():
     return interface
 
 def get_hwaddr_from_plnode():
-    for line in open("/usr/boot/plnode.txt", 'r').readlines():
-        if line.startswith("NET_DEVICE"):
-            return line.split("=")[1].strip().strip('"')
+    try:
+        for line in open("/usr/boot/plnode.txt", 'r').readlines():
+            if line.startswith("NET_DEVICE"):
+                return line.split("=")[1].strip().strip('"')
+    except:
+        pass
     return None
 
 def get_if_from_hwaddr(hwaddr):
-   import sioc
-   devs = sioc.gifconf()
-   for dev in devs:
-      dev_hwaddr = sioc.gifhwaddr(dev)
-      if dev_hwaddr == hwaddr: return dev
-   return None
+    import sioc
+    devs = sioc.gifconf()
+    for dev in devs:
+        dev_hwaddr = sioc.gifhwaddr(dev)
+        if dev_hwaddr == hwaddr: return dev
+    return None
 
 def as_daemon_thread(run):
     """Call function <run> with no arguments in its own thread."""