X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate28.py;h=79b0e8db8250fb3e657edcf9daf9ba4fdb1706a5;hb=1149b8e288d45a56c61b7d3804e25fd33de4f27a;hp=917877d4be439236c7fb31bfc7e922ff003436fa;hpb=160df78096bad73425fa76dcc11df1be85df0df5;p=dak.git

diff --git a/dak/dakdb/update28.py b/dak/dakdb/update28.py
index 917877d4..79b0e8db 100755
--- a/dak/dakdb/update28.py
+++ b/dak/dakdb/update28.py
@@ -32,6 +32,7 @@ import psycopg2
 import time
 from daklib.dak_exceptions import DBUpdateError
 from daklib.config import Config
+import string
 
 ################################################################################
 
@@ -143,17 +144,19 @@ def do_update(self):
         for suite in [i.lower() for i in suites]:
 
             c.execute("SELECT id FROM suite WHERE suite_name ='%s'" % suite )
-            suiterow = c.fetchall()
-            suite_id=suiterow[0]
+            suiterow = c.fetchone()
+            suite_id = suiterow[0]
             arch_list = arches(c, suite_id)
             arch_list = arches(c, suite_id)
+            suitestr=string.replace(suite,'-','_');
 
             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=%s) AND suite=%s"%(arch_str,suite,arch_id,suite_id) )
+                arch_str = string.replace(arch_str,"-", "_")
+                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,suitestr,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=%s"%(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,suitestr,section,suite_id) )
 
 
         c.execute( """CREATE OR REPLACE FUNCTION update_contents_for_bin_a() RETURNS trigger AS  $$