From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Wed, 27 Jul 2011 09:33:13 +0000 (+0200)
Subject: bugfix for finding ns3 bindings when installed in the system
X-Git-Tag: nepi-3.0.0~341^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=68ea764a9484a65438aded5a144b385a66c09e66;p=nepi.git

bugfix for finding ns3 bindings when installed in the system
---

diff --git a/src/nepi/testbeds/ns3/execute.py b/src/nepi/testbeds/ns3/execute.py
index 1a76576c..15acf133 100644
--- a/src/nepi/testbeds/ns3/execute.py
+++ b/src/nepi/testbeds/ns3/execute.py
@@ -45,12 +45,9 @@ def load_ns3_module():
                 raise RuntimeError("Imposible to load shared libraries %s" % str(libs))
             libscp = list(libs)
 
-    if not bindings:
-        import ns3
-        sys.modules["ns3"] = ns3
-        return
-    
-    sys.path.append(bindings)
+    if bindings:
+        sys.path.append(bindings)
+
     import ns3_bindings_import as mod
     sys.modules["ns3"] = mod