From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Wed, 21 Oct 2009 10:19:34 +0000 (+0000)
Subject: import sioc only when needed.
X-Git-Tag: NodeManager-1.8-17~2
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=0ade807b91a8c84098406935d41d749f33efbe9d

import sioc only when needed.
---

diff --git a/tools.py b/tools.py
index f3e67e1..941838b 100644
--- a/tools.py
+++ b/tools.py
@@ -9,10 +9,6 @@ import threading
 import fcntl
 import commands
 import logger
-try:
-   import sioc
-except:
-   pass
 
 PID_FILE = '/var/run/nm.pid'
 
@@ -28,11 +24,12 @@ def get_hwaddr_from_plnode():
     return None
 
 def get_if_from_hwaddr(hwaddr):
-    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."""