X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate18.py;h=bdf241084262522f86a95029b810ae17126c87ee;hb=0a556bbfc566b70d0eb9609eb990dc89bfbd8317;hp=c3ace63d93e7f12282b5a882bc74a7b4a3743fd3;hpb=3b50b545815298b77b8eb68930acb6fde01ea4d4;p=dak.git

diff --git a/dak/dakdb/update18.py b/dak/dakdb/update18.py
index c3ace63d..bdf24108 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",
@@ -145,13 +144,13 @@ def do_update(self):
                         changes.changes = parse_changes(changesfile, signing_rules=-1)
                         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
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply knownchanges update 18, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Unable to apply knownchanges update 18, rollback issued. Error message : %s" % (str(msg)))