add possibility to choose the finished timer timerlist position in usage config

[enigma2.git] / lib / python / Components / Task.py

diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index 86bd233ed261a372d642e869d965cb9b7d02e191..3a755405e5a0bc73e270c5f6d1e3b3028d90f0aa 100644 (file)
--- 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:
@@ -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):