aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components/Task.py
diff options
context:
space:
mode:
authorAndreas Frisch <andreas.frisch@multimedia-labs.de>2008-09-15 14:18:10 +0000
committerAndreas Frisch <andreas.frisch@multimedia-labs.de>2008-09-15 14:18:10 +0000
commitaddc55dea655c3d4cdde664d4127c40481fc93b5 (patch)
treeb3644ccab9d440020552c71a5025a7778342a16d /lib/python/Components/Task.py
parenta1b62eea42d9dbc596f1433b206fb88ac10e9e11 (diff)
downloadenigma2-addc55dea655c3d4cdde664d4127c40481fc93b5.tar.gz
enigma2-addc55dea655c3d4cdde664d4127c40481fc93b5.zip
don't offer to retry non-recoverable tasks & error catching for MplexTask
Diffstat (limited to 'lib/python/Components/Task.py')
-rw-r--r--lib/python/Components/Task.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index d5fffbc6..3e648df1 100644
--- a/lib/python/Components/Task.py
+++ b/lib/python/Components/Task.py
@@ -261,7 +261,11 @@ class JobManager:
if problems:
from Tools import Notifications
from Screens.MessageBox import MessageBox
- Notifications.AddNotificationWithCallback(self.errorCB, MessageBox, _("Error: %s\nRetry?") % (problems[0].getErrorMessage(task)))
+ if problems[0].RECOVERABLE:
+ Notifications.AddNotificationWithCallback(self.errorCB, MessageBox, _("Error: %s\nRetry?") % (problems[0].getErrorMessage(task)))
+ else:
+ Notifications.AddNotification(MessageBox, _("Error") + (': %s') % (problems[0].getErrorMessage(task)), type = MessageBox.TYPE_ERROR )
+ self.errorCB(False)
return
#self.failed_jobs.append(self.active_job)
@@ -317,7 +321,7 @@ class Condition:
RECOVERABLE = False
def getErrorMessage(self, task):
- return _("An error has occured. (%s)") % (self.__class__.__name__)
+ return _("An error has occured. (%s in %s)") % (self.__class__.__name__, task.__class__.__name__)
class WorkspaceExistsPrecondition(Condition):
def check(self, task):