cleanup patch from tbm + real_arch filter

[dak.git] / utils.py

diff --git a/utils.py b/utils.py
index 59beb2af6df05421eb6b7bb8581685c9d3282417..5089f203710a7e7b33e01a2d2add408d5c0abfcb 100644 (file)
--- 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.44 2002-05-18 23:54:51 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
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import os, pwd, re, socket, shutil, string, sys, tempfile
+import commands, os, pwd, re, socket, shutil, string, sys, tempfile
 import apt_pkg
 
 re_comments = re.compile(r"\#.*")
@@ -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;