X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils.py;h=5089f203710a7e7b33e01a2d2add408d5c0abfcb;hb=128efbec918878ff597f09d39779bdf37844149d;hp=b2adbaa64ca5d72c659f6c5b4802510f0068a884;hpb=aa6f79e4b85c95f108c37c3d79f90a93e3ab956e;p=dak.git diff --git a/utils.py b/utils.py index b2adbaa6..5089f203 100644 --- a/utils.py +++ b/utils.py @@ -1,6 +1,6 @@ # Utility functions # Copyright (C) 2000, 2001, 2002 James Troup -# $Id: utils.py,v 1.45 2002-05-19 00:47:27 troup Exp $ +# $Id: utils.py,v 1.46 2002-05-23 12:36: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 @@ -506,6 +506,7 @@ def prefix_multi_line_string(str, prefix): def validate_changes_file_arg(file, fatal=1): error = None; + orig_filename = file if file[-6:] == ".katie": file = file[:-6]+".changes"; @@ -520,9 +521,9 @@ def validate_changes_file_arg(file, fatal=1): if error: if fatal: - fubar("%s: %s." % (file, error)); + fubar("%s: %s." % (orig_filename, error)); else: - warn("Skipping %s - %s" % (file, error)); + warn("Skipping %s - %s" % (orig_filename, error)); return None; else: return file;