Merge remote branch 'ftpmaster/master' into override-cs-db

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

diff --git a/dak/dakdb/update45.py b/dak/dakdb/update45.py
index 0a12d5bc7c1fd44c3ffc06312d1aeae96098ddd1..fe84c9be87627b1d800de02ad6b9e05c4e1b9b84 100755 (executable)
--- a/dak/dakdb/update45.py
+++ b/dak/dakdb/update45.py
@@ -42,12 +42,12 @@ CREATE TABLE extra_src_references (
     bin_id      INT4 NOT NULL REFERENCES binaries(id) ON DELETE CASCADE,
     src_id      INT4 NOT NULL REFERENCES source(id) ON DELETE RESTRICT,
 
-    UNIQUE (bin_id, src_id)
+    PRIMARY KEY (bin_id, src_id)
 )""")
 
         c.execute("UPDATE config SET value = '45' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply update 45, rollback issued. Error message : %s' % (str(msg))
+        raise DBUpdateError('Unable to apply update 45, rollback issued. Error message : %s' % (str(msg)))