X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate18.py;h=bdf241084262522f86a95029b810ae17126c87ee;hb=6b3c8ccbd61325e2b833ed252b5545a190bff92f;hp=b81414186632c73428a36c10400558c96fc63f8c;hpb=d37e01540136c52b055e9dd0305a2d03a33f2c49;p=dak.git

diff --git a/dak/dakdb/update18.py b/dak/dakdb/update18.py
index b8141418..bdf24108 100755
--- 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
 
 ################################################################################
@@ -41,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",
@@ -117,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
@@ -136,22 +142,15 @@ 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:
+                    except InvalidDscError as line:
                         warn("syntax error in .dsc file '%s', line %s." % (f, line))
                         failure += 1
                     except ChangesUnicodeError:
                         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:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply known_changes update 18, rollback issued. Error message
+        raise DBUpdateError("Unable to apply knownchanges update 18, rollback issued. Error message : %s" % (str(msg)))