X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d14da9c99de7d25b8811292e53cc745e30594234..0a62b65175152c42976d4cb04fb7026d9f910915:/lib/python/Components/Task.py

diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index 9a768425..3a755405 100644
--- a/lib/python/Components/Task.py
+++ b/lib/python/Components/Task.py
@@ -16,6 +16,7 @@ class Job(object):
 		self.end = 100
 		self.__progress = 0
 		self.weightScale = 1
+		self.afterEvent = None
 
 		self.state_changed = CList()
 
@@ -63,11 +64,10 @@ class Job(object):
 	def runNext(self):
 		if self.current_task == len(self.tasks):
 			if len(self.resident_tasks) == 0:
-				cb = self.callback
-				self.callback = None
 				self.status = self.FINISHED
 				self.state_changed()
-				cb(self, None, [])
+				self.callback(self, None, [])
+				self.callback = None
 			else:
 				print "still waiting for %d resident task(s) %s to finish" % (len(self.resident_tasks), str(self.resident_tasks))
 		else:
@@ -127,9 +127,11 @@ class Task(object):
 		self.cmd = None
 		self.cwd = "/tmp"
 		self.args = [ ]
+		self.cmdline = None
 		self.task_progress_changed = None
 		self.output_line = ""
 		job.addTask(self)
+		self.container = None
 
 	def setCommandline(self, cmd, args):
 		self.cmd = cmd
@@ -141,6 +143,9 @@ class Task(object):
 		self.global_preconditions.append(ToolExistsPrecondition())
 		self.postconditions.append(ReturncodePostcondition())
 
+	def setCmdline(self, cmdline):
+		self.cmdline = cmdline
+
 	def checkPreconditions(self, immediate = False):
 		not_met = [ ]
 		if immediate:
@@ -166,13 +171,15 @@ class Task(object):
 		self.container.stdoutAvail.append(self.processStdout)
 		self.container.stderrAvail.append(self.processStderr)
 
-		assert self.cmd is not None
-		assert len(self.args) >= 1
-
 		if self.cwd is not None:
 			self.container.setCWD(self.cwd)
 
-		print "execute:", self.container.execute(self.cmd, *self.args), self.cmd, self.args
+		if not self.cmd and self.cmdline:
+			print "execute:", self.container.execute(self.cmdline), self.cmdline
+		else:
+			assert self.cmd is not None
+			assert len(self.args) >= 1
+			print "execute:", self.container.execute(self.cmd, *self.args), ' '.join(self.args)
 		if self.initial_input:
 			self.writeInput(self.initial_input)
 
@@ -205,7 +212,8 @@ class Task(object):
 		self.finish()
 
 	def abort(self):
-		self.container.kill()
+		if self.container:
+			self.container.kill()
 		self.finish(aborted = True)
 
 	def finish(self, aborted = False):
@@ -362,12 +370,20 @@ class DiskspacePrecondition(Condition):
 class ToolExistsPrecondition(Condition):
 	def check(self, task):
 		import os
+		
 		if task.cmd[0]=='/':
-			realpath = task.cmd
+			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:
-			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)
+			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):
 		return _("A required tool (%s) was not found.") % (self.realpath)