Convert exception handling to Python3 syntax.

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

diff --git a/dak/dakdb/update26.py b/dak/dakdb/update26.py
index 70ad62b860362c3c2810b3348dcf5b800618081e..4329bc3aed7c3c29aa674f7a64e385a8b56ad601 100755 (executable)
--- a/dak/dakdb/update26.py
+++ b/dak/dakdb/update26.py
@@ -29,18 +29,18 @@ def do_update(self):
 
     updatetables = ['architecture', 'archive', 'bin_associations', 'bin_contents',
         'binaries', 'binary_acl', 'binary_acl_map', 'build_queue', 'build_queue_files',
-        'changes', 'changes_pending_binaries', 'changes_pending_files', 
-        'changes_pending_files_map', 'changes_pending_source', 'changes_pending_source_files', 
-        'changes_pool_files', 'component', 'config', 'dsc_files', 'files', 'fingerprint', 
-        'keyring_acl_map', 'keyrings', 'location', 'maintainer', 'new_comments', 'override', 
-        'override_type', 'policy_queue', 'priority', 'section', 'source', 'source_acl', 
-        'src_associations', 'src_format', 'src_uploaders', 'suite', 'suite_architectures', 
+        'changes', 'changes_pending_binaries', 'changes_pending_files',
+        'changes_pending_files_map', 'changes_pending_source', 'changes_pending_source_files',
+        'changes_pool_files', 'component', 'config', 'dsc_files', 'files', 'fingerprint',
+        'keyring_acl_map', 'keyrings', 'location', 'maintainer', 'new_comments', 'override',
+        'override_type', 'policy_queue', 'priority', 'section', 'source', 'source_acl',
+        'src_associations', 'src_format', 'src_uploaders', 'suite', 'suite_architectures',
         'suite_build_queue_copy', 'suite_src_formats', 'uid', 'upload_blocks']
 
     c = self.db.cursor()
 
     print "Create trigger function."
-    c.execute("""CREATE OR REPLACE FUNCTION tfunc_set_modified() RETURNS trigger AS $$ 
+    c.execute("""CREATE OR REPLACE FUNCTION tfunc_set_modified() RETURNS trigger AS $$
     BEGIN NEW.modified = now(); return NEW; END;
     $$ LANGUAGE 'plpgsql'""")
 
@@ -54,13 +54,14 @@ def do_update(self):
             c.execute("ALTER TABLE %s ADD COLUMN modified TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now()" % updatetable)
 
             print "Create modified trigger."
-            c.execute("""CREATE TRIGGER modified_%s BEFORE UPDATE ON %s 
+            c.execute("""CREATE TRIGGER modified_%s BEFORE UPDATE ON %s
             FOR EACH ROW EXECUTE PROCEDURE tfunc_set_modified()""" % (updatetable, updatetable))
-       
-    print "Committing"
-    self.db.commit()
 
-    except psycopg2.InternalError, msg:
+        print "Committing"
+        c.execute("UPDATE config SET value = '26' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.InternalError as msg:
             self.db.rollback()
             raise DBUpdateError, "Database error, rollback issued. Error message : %s" % (str(msg))