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

diff --git a/dak/dakdb/update18.py b/dak/dakdb/update18.py
index 896921e1..ce0086f6 100755
--- a/dak/dakdb/update18.py
+++ b/dak/dakdb/update18.py
@@ -42,7 +42,6 @@ from daklib.utils import parse_changes, warn, gpgv_get_status_output, process_gp
 def check_signature (sig_filename, data_filename=""):
     keyrings = [
         "/home/joerg/keyring/keyrings/debian-keyring.gpg",
-        "/home/joerg/keyring/keyrings/debian-keyring.pgp",
         "/home/joerg/keyring/keyrings/debian-maintainers.gpg",
         "/home/joerg/keyring/keyrings/debian-role-keys.gpg",
         "/home/joerg/keyring/keyrings/emeritus-keyring.pgp",
@@ -118,6 +117,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 +142,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 +151,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))