Merge commit 'ftpmaster/master' into psycopg2

[dak.git] / dak / examine_package.py

diff --git a/dak/examine_package.py b/dak/examine_package.py
index f7f3f0d5984225336417f2763cfe4a01e3355fe6..2a1a711e04ed4dd50f98855bf18770376d095553 100755 (executable)
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -455,11 +455,11 @@ def check_deb (suite, deb_filename):
 # Read a file, strip the signature and return the modified contents as
 # a string.
 def strip_pgp_signature (filename):
-    file = utils.open_file (filename)
+    inputfile = utils.open_file (filename)
     contents = ""
     inside_signature = 0
     skip_next = 0
-    for line in file.readlines():
+    for line in inputfile.readlines():
         if line[:-1] == "":
             continue
         if inside_signature:
@@ -477,7 +477,7 @@ def strip_pgp_signature (filename):
             inside_signature = 0
             continue
         contents += line
-    file.close()
+    inputfile.close()
     return contents
 
 def display_changes(suite, changes_filename):
@@ -527,9 +527,9 @@ def main ():
                 if f.endswith(".changes"):
                     check_changes(f)
                 elif f.endswith(".deb") or f.endswith(".udeb"):
-                    # default to unstable when we don't have a .changes file 
+                    # default to unstable when we don't have a .changes file
                     # perhaps this should be a command line option?
-                    check_deb('unstable', file) 
+                    check_deb('unstable', file)
                 elif f.endswith(".dsc"):
                     check_dsc('unstable', f)
                 else: