Merge commit 'pkern/master' into merge

[dak.git] / daklib / dak_exceptions.py

diff --git a/daklib/dak_exceptions.py b/daklib/dak_exceptions.py
index e9ab2c720c8b3501d843f1b1d109e89ea2264d5d..4e795461532e6b6284057b5a961ac88d329c83be 100644 (file)
--- a/daklib/dak_exceptions.py
+++ b/daklib/dak_exceptions.py
@@ -28,9 +28,12 @@ class DakError(Exception):
        message -- explanation of the error
     """
 
-    def __init__(self, message):
-        self.args = message
-        self.message = message
+    def __init__(self, message=""):
+        self.args = str(message)
+        self.message = str(message)
+
+    def __str__(self):
+        return self.message
 
 __all__ = ['DakError']
 
@@ -41,13 +44,14 @@ dakerrors = {
     "UnknownFormatError":  """Exception raised for unknown Format: lines in changes files.""",
     "NoFilesFieldError":   """Exception raised for missing files field in dsc/changes.""",
     "CantOpenError":       """Exception raised when files can't be opened.""",
-    "CantOverwriteError":  """Exception raised when files cant be overwritten.""",
+    "CantOverwriteError":  """Exception raised when files can't be overwritten.""",
     "FileExistsError":     """Exception raised when destination file exists.""",
     "SendmailFailedError": """Exception raised when Sendmail invocation failed.""",
-    "NoFreeFilenameError": """Exception raised when no alternate filename was found."""
+    "NoFreeFilenameError": """Exception raised when no alternate filename was found.""",
+    "TransitionsError":    """Exception raised when transitions file can't be parsed.""",
+    "NoSourceFieldError":  """Exception raised - we cant find the source - wtf?"""
 }
 
-
 def construct_dak_exception(name, description):
     class Er(DakError):
         __doc__ = description