From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Fri, 19 Aug 2011 10:12:04 +0000 (+0200)
Subject: Make TunFilter find builtin scripts for the user
X-Git-Tag: nepi-3.0.0~282
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=450e5225c6daea9ffa1c70cae7f1c58d48745fac;p=nepi.git

Make TunFilter find builtin scripts for the user
---

diff --git a/src/nepi/testbeds/planetlab/tunproto.py b/src/nepi/testbeds/planetlab/tunproto.py
index 779476cd..35598556 100644
--- a/src/nepi/testbeds/planetlab/tunproto.py
+++ b/src/nepi/testbeds/planetlab/tunproto.py
@@ -94,7 +94,18 @@ class TunProtoBase(object):
         if local.filter_module:
             filter_sources = filter(bool,map(str.strip,local.filter_module.module.split()))
             filter_module = filter_sources[0]
+            
+            # Translate paths to builtin sources
+            for i,source in enumerate(filter_sources):
+                if not os.path.exists(source):
+                    # Um... try the builtin folder
+                    source = os.path.join(os.path.dirname(__file__), source)
+                    if os.path.exists(source):
+                        # Yep... replace
+                        filter_sources[i] = source
+
             sources.extend(set(filter_sources))
+                
         else:
             filter_module = None
             filter_sources = None