X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Ftransitions.py;h=b69c57327f69769467b0819ad51145c535e1b21d;hb=813e459ceb4cdacc2498a2e2c2d51fc37437a53f;hp=7a0da2e11dd5cc50cada96b75ba83e9898045aaa;hpb=020f423243aaeab5ede2313b274131067386213f;p=dak.git diff --git a/dak/transitions.py b/dak/transitions.py index 7a0da2e1..b69c5732 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 import daklib.database as database import daklib.utils as utils +from daklib.dak_extensions 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)