Revision: 3881
Author: janne.t.harkonen
Date: Tue Aug 24 03:42:26 2010
Log: Force robot.libraries in sys.path to work inside jar
http://code.google.com/p/robotframework/source/detail?r=3881
Modified:
/trunk/src/robot/pythonpathsetter.py
=======================================
--- /trunk/src/robot/pythonpathsetter.py Mon May 31 05:21:54 2010
+++ /trunk/src/robot/pythonpathsetter.py Tue Aug 24 03:42:26 2010
@@ -27,11 +27,11 @@
path = path.lower()
return path
-def add_path(path, to_beginning=False):
+def add_path(path, to_beginning=False, force=False):
if not path:
return
path = norm_path(path)
- if path not in sys.path and os.path.exists(path):
+ if path not in sys.path and (os.path.exists(path) or force):
if to_beginning:
sys.path.insert(0, path)
else:
@@ -48,7 +48,8 @@
ROBOTDIR = norm_path(os.path.dirname(os.path.abspath(__file__)))
PARENTDIR = os.path.dirname(ROBOTDIR)
-add_path(os.path.join(ROBOTDIR, 'libraries'), to_beginning=True)
+add_path(os.path.join(ROBOTDIR, 'libraries'), to_beginning=True,
+ force=True)
add_path(PARENTDIR, to_beginning=True)
# Handles egg installations
if
fnmatch.fnmatchcase(os.path.basename(PARENTDIR), 'robotframework-*.egg'):
