X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate18.py;h=c3ace63d93e7f12282b5a882bc74a7b4a3743fd3;hb=c7cd84ed41a5b670db475483b5ed3016931c223d;hp=896921e14704ec029b6dc6c519c2bbc668a713c8;hpb=c49651812873727acf7143de9976875130565c29;p=dak.git

diff --git a/dak/dakdb/update18.py b/dak/dakdb/update18.py
index 896921e1..c3ace63d 100755
--- a/dak/dakdb/update18.py
+++ b/dak/dakdb/update18.py
@@ -118,6 +118,12 @@ def do_update(self):
         c.execute("CREATE INDEX changesdistribution_ind ON known_changes(distribution)")
         c.execute("CREATE INDEX changesurgency_ind ON known_changes(urgency)")
 
+        c.execute("GRANT ALL ON known_changes TO ftpmaster;")
+        c.execute("GRANT SELECT ON known_changes TO public;")
+
+        c.execute("UPDATE config SET value = '18' WHERE name = 'db_revision'")
+        self.db.commit()
+
         print "Done. Now looking for old changes files"
         count = 0
         failure = 0
@@ -137,7 +143,7 @@ def do_update(self):
                         changes.changes_file = filename
                         changesfile = os.path.join(checkdir, filename)
                         changes.changes = parse_changes(changesfile, signing_rules=-1)
-                        changes.changes["fingerprint"], = check_signature(changesfile)
+                        changes.changes["fingerprint"] = check_signature(changesfile)
                         changes.add_known_changes(directory)
                     except InvalidDscError, line:
                         warn("syntax error in .dsc file '%s', line %s." % (f, line))
@@ -146,13 +152,6 @@ def do_update(self):
                         warn("found invalid changes file, not properly utf-8 encoded")
                         failure += 1
 
-
-        c.execute("GRANT ALL ON known_changes TO ftpmaster;")
-        c.execute("GRANT SELECT ON known_changes TO public;")
-
-        c.execute("UPDATE config SET value = '18' WHERE name = 'db_revision'")
-        self.db.commit()
-
     except psycopg2.ProgrammingError, msg:
         self.db.rollback()
         raise DBUpdateError, "Unable to apply knownchanges update 18, rollback issued. Error message : %s" % (str(msg))