From 45c61f94d3f6625c1f1074549ea677d81bd15c4d Mon Sep 17 00:00:00 2001
From: James Troup <james@nocrew.org>
Date: Thu, 23 May 2002 12:36:15 +0000
Subject: [PATCH] use original filename in error messages in
validate_changes_file_arg [tbm]
---
utils.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
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 <james@nocrew.org>
-# $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;
--
2.39.5