X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Ftransitions.py;h=a37dbef9f1da7b8bb27ec3d388114af47b68a214;hb=99e73119fc4698d8149ddf4b4397ba93e98efc2b;hp=5c81e03aca1829af9dbd933efc0bc2c277b35779;hpb=8e60420c69a993a4041c22008dafc2fcb238d0d5;p=dak.git diff --git a/dak/transitions.py b/dak/transitions.py index 5c81e03a..a37dbef9 100755 --- a/dak/transitions.py +++ b/dak/transitions.py @@ -27,6 +27,7 @@ import os, pg, sys, time, errno, fcntl, tempfile, pwd, re import apt_pkg from daklib import database from daklib import utils +from daklib.dak_exceptions import TransitionsError import syck # Globals @@ -227,9 +228,6 @@ def write_transitions(from_trans): ################################################################################ -class ParseException(Exception): - pass - ########################################## #### This usually runs within sudo !! #### ########################################## @@ -248,7 +246,7 @@ def write_transitions_from_file(from_file): 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 @@ 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)