merge from mainline

diff --combined dak/transitions.py
index 5c81e03aca1829af9dbd933efc0bc2c277b35779,7133d8413fda2e1da1bbc98e79063d783d8fe9fe..a37dbef9f1da7b8bb27ec3d388114af47b68a214
--- 1/dak/transitions.py
--- 2/dak/transitions.py
+++ b/dak/transitions.py
@@@ -25,8 -25,9 +25,9 @@@
  
  import os, pg, sys, time, errno, fcntl, tempfile, pwd, re
  import apt_pkg
 -import daklib.database as database
 -import daklib.utils as utils
 +from daklib import database
 +from daklib import utils
+ from daklib.dak_exceptions import TransitionsError
  import syck
  
  # Globals
@@@ -227,9 -228,6 +228,6 @@@ def write_transitions(from_trans)
  
  ################################################################################
  
- class ParseException(Exception):
-     pass
- 
  ##########################################
  #### This usually runs within sudo !! ####
  ##########################################
@@@ -248,7 -246,7 +246,7 @@@ def write_transitions_from_file(from_fi
      else:
          trans = load_transitions(from_file)
          if trans is None:
-             raise ParseException, "Unparsable transitions file %s" % (file)
+             raise TransitionsError, "Unparsable transitions file %s" % (file)
          write_transitions(trans)
  
  ################################################################################
@@@ -458,7 -456,7 +456,7 @@@ def main()
      if Options["import"]:
          try:
              write_transitions_from_file(Options["import"])
-         except ParseException, m:
+         except TransitionsError, m:
              print m
              sys.exit(2)
          sys.exit(0)