fix execute string for tasks

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

diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index 9a9d9fb72f5bff1a4d74f96cc49ccdface97bf44..c152e9a28ac4077bb9fb5e008bd7ac5210edf1d9 100644 (file)
--- a/lib/python/Components/Task.py
+++ b/lib/python/Components/Task.py
@@ -37,6 +37,9 @@ class Job(object):
 
        progress = property(getProgress)
 
+       def getStatustext(self):
+               return { self.NOT_STARTED: _("Waiting"), self.IN_PROGRESS: _("In Progress"), self.FINISHED: _("Finished"), self.FAILED: _("Failed") }[self.status]
+
        def task_progress_changed_CB(self):
                self.state_changed()
 
@@ -133,7 +136,6 @@ class Task(object):
 
        def setTool(self, tool):
                self.cmd = tool
-               self.args = [tool]
                self.global_preconditions.append(ToolExistsPrecondition())
                self.postconditions.append(ReturncodePostcondition())
 
@@ -159,9 +161,9 @@ class Task(object):
                self.task_progress_changed = task_progress_changed
                from enigma import eConsoleAppContainer
                self.container = eConsoleAppContainer()
-               self.container.appClosed.get().append(self.processFinished)
-               self.container.stdoutAvail.get().append(self.processStdout)
-               self.container.stderrAvail.get().append(self.processStderr)
+               self.container.appClosed.append(self.processFinished)
+               self.container.stdoutAvail.append(self.processStdout)
+               self.container.stderrAvail.append(self.processStderr)
 
                assert self.cmd is not None
                assert len(self.args) >= 1
@@ -169,7 +171,8 @@ class Task(object):
                if self.cwd is not None:
                        self.container.setCWD(self.cwd)
 
-               print "execute:", self.container.execute(self.cmd, self.args), self.cmd, " ".join(self.args)
+               #execstr = " ".join([self.cmd]+self.args)
+               print "execute:", self.container.execute(execstr), execstr
                if self.initial_input:
                        self.writeInput(self.initial_input)