X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate28.py;h=0d1f22089b52c133d575a14dda5bff5d3711c4dd;hb=f291297ba4eab8ab5f130002acb2675c997f291c;hp=39a268016beb773883c7192f85ed089703df4f42;hpb=0e38a664493870d8c764ae02f50693b6c7ee0e1d;p=dak.git

diff --git a/dak/dakdb/update28.py b/dak/dakdb/update28.py
index 39a26801..0d1f2208 100755
--- a/dak/dakdb/update28.py
+++ b/dak/dakdb/update28.py
@@ -32,7 +32,6 @@ import psycopg2
 import time
 from daklib.dak_exceptions import DBUpdateError
 from daklib.config import Config
-from daklib.dakdb import DBConn
 
 ################################################################################
 
@@ -51,7 +50,7 @@ def arches(cursor, suite):
     cursor.execute("""SELECT s.architecture, a.arch_string
     FROM suite_architectures s
     JOIN architecture a ON (s.architecture=a.id)
-    WHERE suite = :suite""", {'suite' : suite })
+    WHERE suite = '%s'""" % suite)
 
     while True:
         r = cursor.fetchone()
@@ -144,19 +143,17 @@ def do_update(self):
         for suite in [i.lower() for i in suites]:
 
             c.execute("SELECT id FROM suite WHERE suite_name ='%s'" % suite )
-            rows = c.fetchall()
-
-
-            suite_id = DBConn().get_suite_id(suite)
+            suiterow = c.fetchone()
+            suite_id = suiterow[0]
             arch_list = arches(c, suite_id)
             arch_list = arches(c, suite_id)
 
             for (arch_id,arch_str) in arch_list:
-                c.execute( "CREATE INDEX ind_deb_contents_%s_%s ON deb_contents (arch,suite) WHERE (arch=2 OR arch=%d) AND suite=$d"%(arch_str,suite,arch_id,suite_id) )
+                c.execute( "CREATE INDEX ind_deb_contents_%s_%s ON deb_contents (arch,suite) WHERE (arch=2 OR arch=%s) AND suite='%s'"%(arch_str,suite,arch_id,suite_id) )
 
             for section, sname in [("debian-installer","main"),
                                   ("non-free/debian-installer", "nonfree")]:
-                c.execute( "CREATE INDEX ind_udeb_contents_%s_%s ON udeb_contents (section,suite) WHERE section=%s AND suite=$d"%(sname,suite,section,suite_id) )
+                c.execute( "CREATE INDEX ind_udeb_contents_%s_%s ON udeb_contents (section,suite) WHERE section='%s' AND suite='%s'"%(sname,suite,section,suite_id) )
 
 
         c.execute( """CREATE OR REPLACE FUNCTION update_contents_for_bin_a() RETURNS trigger AS  $$