From addc55dea655c3d4cdde664d4127c40481fc93b5 Mon Sep 17 00:00:00 2001 From: Andreas Frisch Date: Mon, 15 Sep 2008 14:18:10 +0000 Subject: don't offer to retry non-recoverable tasks & error catching for MplexTask --- lib/python/Components/Task.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/python/Components') 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): -- cgit v1.2.3