X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=8d5dd4b574068d84283050347342612600566747;hb=f252ae76ae7e8fe55350b0c35e1b26282c03b141;hp=1418d081856192b9574fa6a63800138df9c36794;hpb=2eab0bd6bdd98ef816f78b74f85ca9fe5792804c;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 1418d081..8d5dd4b5 100644 --- 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') @@ -2291,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')