diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2010-03-08 17:25:37 +0100 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2010-03-08 17:25:37 +0100 |
| commit | d0509622a73b8b84edf260599b853cab72903402 (patch) | |
| tree | e1ef4e43abe07c1631a5e53f37f3b8427840de2c /lib/python/Components | |
| parent | 46987d3de4111d3ccdbfe615b9f3f9f489941b23 (diff) | |
| download | enigma2-d0509622a73b8b84edf260599b853cab72903402.tar.gz enigma2-d0509622a73b8b84edf260599b853cab72903402.zip | |
refs bug #429
- allow absolute path names in Task.py but print a warning
- search in task.cwd as well
Diffstat (limited to 'lib/python/Components')
| -rw-r--r-- | lib/python/Components/Task.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py index 86bd233e..a1e04bce 100644 --- a/lib/python/Components/Task.py +++ b/lib/python/Components/Task.py @@ -371,12 +371,18 @@ class ToolExistsPrecondition(Condition): def check(self, task): import os - self.realpath = task.cmd - path = os.environ.get('PATH', '').split(os.pathsep) - absolutes = filter(lambda file: os.access(file, os.X_OK), map(lambda directory, file = task.cmd: os.path.join(directory, file), path)) - if len(absolutes) > 0: - self.realpath = task.cmd[0] - return True + if task.cmd[0]=='/': + self.realpath = task.cmd + print "[Task.py][ToolExistsPrecondition] WARNING: usage of absolute paths for tasks should be avoided!" + return os.access(self.realpath, os.X_OK) + else: + self.realpath = task.cmd + path = os.environ.get('PATH', '').split(os.pathsep) + path.append(task.cwd + '/') + absolutes = filter(lambda file: os.access(file, os.X_OK), map(lambda directory, file = task.cmd: os.path.join(directory, file), path)) + if len(absolutes) > 0: + self.realpath = task.cmd[0] + return True return False def getErrorMessage(self, task): |