clean up pychecker warnings

[dak.git] / dak / check_archive.py

diff --git a/dak/check_archive.py b/dak/check_archive.py
old mode 100755 (executable)
new mode 100644 (file)
index d60d530..227cda9
--- a/dak/check_archive.py
+++ b/dak/check_archive.py
@@ -94,19 +94,19 @@ def check_files():
     print "Missing files:"
     db_files.clear()
     for i in ql:
-       filename = os.path.abspath(i[0] + i[1])
+        filename = os.path.abspath(i[0] + i[1])
         db_files[filename] = ""
         if os.access(filename, os.R_OK) == 0:
-           if i[2]:
+            if i[2]:
                 print "(last used: %s) %s" % (i[2], filename)
-           else:
+            else:
                 print "%s" % (filename)
-       
+
 
     filename = Cnf["Dir::Override"]+'override.unreferenced'
     if os.path.exists(filename):
-        file = daklib.utils.open_file(filename)
-        for filename in file.readlines():
+        f = daklib.utils.open_file(filename)
+        for filename in f.readlines():
             filename = filename[:-1]
             excluded[filename] = ""
 
@@ -129,11 +129,11 @@ def check_dscs():
         list_filename = '%s%s_%s_source.list' % (Cnf["Dir::Lists"], suite, component)
         list_file = daklib.utils.open_file(list_filename)
         for line in list_file.readlines():
-            file = line[:-1]
+            f = line[:-1]
             try:
-                daklib.utils.parse_changes(file, signing_rules=1)
+                daklib.utils.parse_changes(f, signing_rules=1)
             except daklib.utils.invalid_dsc_format_exc, line:
-                daklib.utils.warn("syntax error in .dsc file '%s', line %s." % (file, line))
+                daklib.utils.warn("syntax error in .dsc file '%s', line %s." % (f, line))
                 count += 1
 
     if count:
@@ -201,15 +201,15 @@ def check_md5sums():
 
     print "Checking file md5sums & sizes..."
     for i in ql:
-       filename = os.path.abspath(i[0] + i[1])
+        filename = os.path.abspath(i[0] + i[1])
         db_md5sum = i[2]
         db_size = int(i[3])
         try:
-            file = daklib.utils.open_file(filename)
+            f = daklib.utils.open_file(filename)
         except:
             daklib.utils.warn("can't open '%s'." % (filename))
             continue
-        md5sum = apt_pkg.md5sum(file)
+        md5sum = apt_pkg.md5sum(f)
         size = os.stat(filename)[stat.ST_SIZE]
         if md5sum != db_md5sum:
             daklib.utils.warn("**WARNING** md5sum mismatch for '%s' ('%s' [current] vs. '%s' [db])." % (filename, md5sum, db_md5sum))
@@ -238,14 +238,14 @@ def check_timestamps():
     db_files.clear()
     count = 0
     for i in ql:
-       filename = os.path.abspath(i[0] + i[1])
+        filename = os.path.abspath(i[0] + i[1])
         if os.access(filename, os.R_OK):
-            file = daklib.utils.open_file(filename)
+            f = daklib.utils.open_file(filename)
             current_file = filename
             sys.stderr.write("Processing %s.\n" % (filename))
-            apt_inst.debExtract(file,Ent,"control.tar.gz")
-            file.seek(0)
-            apt_inst.debExtract(file,Ent,"data.tar.gz")
+            apt_inst.debExtract(f, Ent, "control.tar.gz")
+            f.seek(0)
+            apt_inst.debExtract(f, Ent, "data.tar.gz")
             count += 1
     print "Checked %d files (out of %d)." % (count, len(db_files.keys()))
 
@@ -270,15 +270,15 @@ def check_missing_tar_gz_in_dsc():
             daklib.utils.fubar("error parsing .dsc file '%s'." % (filename))
         dsc_files = daklib.utils.build_file_list(dsc, is_a_dsc=1)
         has_tar = 0
-        for file in dsc_files.keys():
-            m = daklib.utils.re_issource.match(file)
+        for f in dsc_files.keys():
+            m = daklib.utils.re_issource.match(f)
             if not m:
-                daklib.utils.fubar("%s not recognised as source." % (file))
-            type = m.group(3)
-            if type == "orig.tar.gz" or type == "tar.gz":
+                daklib.utils.fubar("%s not recognised as source." % (f))
+            ftype = m.group(3)
+            if ftype == "orig.tar.gz" or ftype == "tar.gz":
                 has_tar = 1
         if not has_tar:
-            daklib.utils.warn("%s has no .tar.gz in the .dsc file." % (file))
+            daklib.utils.warn("%s has no .tar.gz in the .dsc file." % (f))
             count += 1
 
     if count:
@@ -375,7 +375,7 @@ def check_files_not_symlinks():
 
 #      q = projectB.query("BEGIN WORK")
     for i in q_files:
-       filename = os.path.normpath(i[0] + i[1])
+        filename = os.path.normpath(i[0] + i[1])
 #        file_id = i[2]
         if os.access(filename, os.R_OK) == 0:
             daklib.utils.warn("%s: doesn't exist." % (filename))
@@ -431,14 +431,14 @@ def main ():
     Cnf = daklib.utils.get_conf()
     Arguments = [('h',"help","Check-Archive::Options::Help")]
     for i in [ "help" ]:
-       if not Cnf.has_key("Check-Archive::Options::%s" % (i)):
-           Cnf["Check-Archive::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Check-Archive::Options::%s" % (i)):
+            Cnf["Check-Archive::Options::%s" % (i)] = ""
 
     args = apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
 
     Options = Cnf.SubTree("Check-Archive::Options")
     if Options["Help"]:
-       usage()
+        usage()
 
     if len(args) < 1:
         daklib.utils.warn("dak check-archive requires at least one argument")