]> git.decadent.org.uk Git - dak.git/blobdiff - dak/process_unchecked.py
Merge branch 'master' into bugfixes
[dak.git] / dak / process_unchecked.py
index 938f839cca77faf441033b56d4ebeedf10c6add9..8f9857f411660ec286c3388e76d8e2d3d98aefb6 100755 (executable)
@@ -562,7 +562,7 @@ def check_files():
             # Check the version and for file overwrites
             reject(Upload.check_binary_against_db(f),"")
 
-            Binary(f, reject).scan_package( )
+            Binary(f, reject).scan_package()
 
         # Checks for a source package...
         else:
@@ -1321,7 +1321,7 @@ def is_stableupdate ():
                            JOIN src_associations sa ON (s.id = sa.source)
                            WHERE s.source = %(source)s
                               AND s.version = %(version)s
-                              AND sa.suite = %(suite)d""",
+                              AND sa.suite = %(suite)s""",
                         {'source' : changes['source'],
                          'version' : changes['version'],
                          'suite' : pusuite})
@@ -1352,14 +1352,14 @@ def is_oldstableupdate ():
     if not changes["architecture"].has_key("source"):
         pusuite = DBConn().get_suite_id("oldstable-proposed-updates")
         cursor = DBConn().cursor()
-        cursor.execute( """"SELECT 1 FROM source s
-                            JOIN src_associations sa ON (s.id = sa.source)
-                            WHERE s.source = %(source)s
-                              AND s.version = %(version)s
-                               AND sa.suite = %d""",
-                        {'source' : changes['source'],
+        cursor.execute( """SELECT 1 FROM source s
+                           JOIN src_associations sa ON (s.id = sa.source)
+                           WHERE s.source = %(source)s
+                             AND s.version = %(version)s
+                             AND sa.suite = %(suite)s""",
+                        {'source' :  changes['source'],
                          'version' : changes['version'],
-                         'suite' : pusuite})
+                         'suite' :   pusuite})
         if cursor.fetchone():
             return 0