X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils.py;h=59df9f3c36164a066320857fb9ef6e315003c236;hb=89ada75793da6403e6ceb74a66a119621f19bba4;hp=b452ff8a162fcb0497b01318edc2a84c856c32fe;hpb=1f27b6cf94ec1a0f3d5ee354a2bd0659f437c369;p=dak.git diff --git a/utils.py b/utils.py index b452ff8a..59df9f3c 100644 --- a/utils.py +++ b/utils.py @@ -1,6 +1,6 @@ # Utility functions -# Copyright (C) 2000 James Troup -# $Id: utils.py,v 1.27 2001-06-22 23:30:21 troup Exp $ +# Copyright (C) 2000, 2001 James Troup +# $Id: utils.py,v 1.30 2001-07-25 15:51:15 troup Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -58,7 +58,7 @@ valid_components = { ###################################################################################### -def open_file(filename, mode): +def open_file(filename, mode='r'): try: f = open(filename, mode); except IOError: @@ -216,7 +216,7 @@ def build_file_list(changes, dsc): if format != "": format = float(format) if dsc == "" and (format < 1.5 or format > 2.0): - raise nk_format_exc, changes["format"]; + raise nk_format_exc, format; # No really, this has happened. Think 0 length .dsc file. if not changes.has_key("files"): @@ -456,12 +456,12 @@ def cc_fix_changes (changes): def changes_compare (a, b): try: a_changes = parse_changes(a, 0) - except changes_parse_error_exc, line: + except: return -1; try: b_changes = parse_changes(b, 0) - except changes_parse_error_exc, line: + except: return 1; cc_fix_changes (a_changes);