Merge commit 'ftpmaster/master' into psycopg2

[dak.git] / dak / override.py

diff --git a/dak/override.py b/dak/override.py
index f98f03c5ae21a2f761fa1bd9550949e7e90a4b97..0bda5e769996f64f6cbaed6996aa4e3190178277 100755 (executable)
--- a/dak/override.py
+++ b/dak/override.py
@@ -107,9 +107,9 @@ def main ():
 
     # Retrieve current section/priority...
     oldsection, oldsourcesection, oldpriority = None, None, None
-    for type in ['source', 'binary']:
+    for packagetype in ['source', 'binary']:
         eqdsc = '!='
-        if type == 'source':
+        if packagetype == 'source':
             eqdsc = '='
         q = projectB.query("""
     SELECT priority.priority AS prio, section.section AS sect, override_type.type AS type
@@ -129,7 +129,7 @@ def main ():
             utils.fubar("%s is ambiguous. Matches %d packages" % (package,q.ntuples()))
 
         r = q.getresult()
-        if type == 'binary':
+        if packagetype == 'binary':
             oldsection = r[0][1]
             oldpriority = r[0][0]
         else: