From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Mon, 8 Mar 2010 16:25:37 +0000 (+0100)
Subject: refs bug #429
X-Git-Tag: 2.8.0~38
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/a529e6282d8e84817462dbb4be14adb4dfd6ee84

refs bug #429
- allow absolute path names in Task.py but print a warning
- search in task.cwd as well
---

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):