Merge commit 'djpig/process-upload'

[dak.git] / dak / dakdb / update18.py

diff --git a/dak/dakdb/update18.py b/dak/dakdb/update18.py
index d24201184d2626bf24987377e8d048a3cbc780b0..c3ace63d93e7f12282b5a882bc74a7b4a3743fd3 100755 (executable)
--- a/dak/dakdb/update18.py
+++ b/dak/dakdb/update18.py
@@ -34,6 +34,7 @@ import os
 import datetime
 from daklib.dak_exceptions import DBUpdateError, InvalidDscError, ChangesUnicodeError
 from daklib.config import Config
+from daklib.changes import Changes
 from daklib.utils import parse_changes, warn, gpgv_get_status_output, process_gpgv_output
 
 ################################################################################
@@ -117,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
@@ -136,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))
@@ -145,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))