Fix invalid override of PulpDataException

daviddavis · Aug 26, 2013 · 63e69e2 · 63e69e2
1 parent c490efa
commit 63e69e2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/platform/src/pulp/client/commands/polling.py b/platform/src/pulp/client/commands/polling.py
@@ -160,7 +160,6 @@ def poll(self, task_list, user_input):
         except Exception, e:
             # If any task raises an Exception and there is a error_message specified in the
             # task results that error should be displayed to the end user
-            #if task and task.result and 'error_message' in task.result:
             if task and task.result and 'error_message' in task.result:
                 self.context.prompt.render_failure_message(task.result['error_message'])
             else:

diff --git a/platform/src/pulp/server/exceptions.py b/platform/src/pulp/server/exceptions.py
@@ -197,17 +197,14 @@ def data_dict(self):
 
 # data exceptions --------------------------------------------------------------
 
+
 class PulpDataException(PulpException):
     """
     Base class of exceptions raised due to data validation errors.
     """
     # NOTE intermediate exception class, no overrides will be provided
     http_status_code = httplib.BAD_REQUEST
 
-    def __init__(self, units, message=None):
-        PulpException.__init__(self, message)
-        self.units = units
-
 
 class InvalidValue(PulpDataException):
     """

diff --git a/platform/src/pulp/server/managers/consumer/agent.py b/platform/src/pulp/server/managers/consumer/agent.py
@@ -230,7 +230,7 @@ def __invoke_plugin(self, call, *args, **kwargs):
             return call(*args, **kwargs)
         except InvalidUnitsRequested, e:
             trace = sys.exc_info()[2]
-            raise PulpDataException(e.units, e.message), None, trace
+            raise PulpDataException(e.message), None, trace
         except Exception:
             raise PulpExecutionException(), None, sys.exc_info()[2]