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

refs bug #429
use PATH variable to determine, if an executable file exists instead of just parsing the command string for a leading /
---

diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index df94f8a6..86bd233e 100644
--- a/lib/python/Components/Task.py
+++ b/lib/python/Components/Task.py
@@ -370,12 +370,14 @@ class DiskspacePrecondition(Condition):
 class ToolExistsPrecondition(Condition):
 	def check(self, task):
 		import os
-		if task.cmd[0]=='/':
-			realpath = task.cmd
-		else:
-			realpath = task.cwd + '/' + task.cmd
-		self.realpath = realpath
-		return os.access(realpath, os.X_OK)
+		
+		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
+		return False 
 
 	def getErrorMessage(self, task):
 		return _("A required tool (%s) was not found.") % (self.realpath)