X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=0a03d1fe26a35c7e5a49e07bed326604d53b8274;hb=2e8dc068d879b7fed7adedc394422501448d0ede;hp=13409eb4d96effc89e750ec17c1d5366c8b9711d;hpb=e9628d0da14a4a046b04ac6c20675432168dcc4a;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
index 13409eb4..0a03d1fe 100644
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -695,7 +695,7 @@ distribution."""
 			if x[1] in s and x[0] not in s:
 				s.append(x[0])
 
-		que = "SELECT s.version FROM source s JOIN src_associations sa ON (s.id = sa.source) JOIN suite su ON (sa.suite = su.id) WHERE s.source = '%s' AND (%s)" % (package, string.join(["su.suite_name = '%s'" % a for a in s], " OR "))
+		que = "SELECT s.version FROM source s JOIN src_associations sa ON (s.id = sa.source) JOIN suite su ON (sa.suite = su.id) WHERE s.source = '%s' AND (%s)" % (package, " OR ".join(["su.suite_name = '%s'" % a for a in s]))
             q = self.projectB.query(que)
 
             # Reduce the query results to a list of version numbers
@@ -774,7 +774,7 @@ distribution."""
         anyversion=None
         anysuite = [suite] + self.Cnf.ValueList("Suite::%s::VersionChecks::Enhances" % (suite))
         for (v, s) in query_result:
-            if s in [ string.lower(x) for x in anysuite ]:
+            if s in [ x.lower() for x in anysuite ]:
                 if not anyversion or apt_pkg.VersionCompare(anyversion, v) <= 0:
                     anyversion=v
         return anyversion