show-new

[dak.git] / daklib / dbconn.py

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 7047f59bbc3ea5ad1f39b431c28a10037ed9b0ec..fa9431b23b2d1c696752b5faa443553b5cc695bd 100644 (file)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -377,16 +377,16 @@ def get_binary_from_name_suite(package, suitename, session=None):
 
     sql = """SELECT DISTINCT(b.package), b.version, c.name, su.suite_name
              FROM binaries b, files fi, location l, component c, bin_associations ba, suite su
-             WHERE b.package=:package
+             WHERE b.package='%(package)s'
                AND b.file = fi.id
                AND fi.location = l.id
                AND l.component = c.id
                AND ba.bin=b.id
                AND ba.suite = su.id
-               AND su.suite_name=:suitename
+               AND su.suite_name=%(suitename)s
           ORDER BY b.version DESC"""
 
-    return session.execute(sql, {'package': package, 'suitename': suitename})
+    return session.execute(sql % {'package': package, 'suitename': suitename})
 
 __all__.append('get_binary_from_name_suite')
 
@@ -1441,12 +1441,10 @@ class DBChange(object):
         session = DBConn().session().object_session(self)
 
         # Remove changes_pool_files entries
-        for pf in self.poolfiles:
-            self.poolfiles.remove(pf)
+        self.poolfiles = []
 
-        # Remove change
-        for cf in self.files:
-            self.files.remove(cf)
+        # Remove changes_pending_files references
+        self.files = []
 
         # Clear out of queue
         self.in_queue = None
@@ -2293,7 +2291,7 @@ def add_dsc_to_db(u, filename, session=None):
 
     session.flush()
 
-    return dsc_component, dsc_location_id, pfs
+    return source, dsc_component, dsc_location_id, pfs
 
 __all__.append('add_dsc_to_db')