Python modules should not be executable

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

diff --git a/dak/dakdb/update1.py b/dak/dakdb/update1.py
index 3f0aa8015809b48a56011ba299e67116c61269ce..21942765e560b056d167d3755e409fe73d5343c0 100644 (file)
--- a/dak/dakdb/update1.py
+++ b/dak/dakdb/update1.py
@@ -1,7 +1,12 @@
 #!/usr/bin/env python
 
-# Debian Archive Kit Database Update Script
-# Copyright (C) 2008  Michael Casadevall <mcasadevall@debian.org>
+"""
+Saner DM db schema
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2008  Michael Casadevall <mcasadevall@debian.org>
+@license: GNU General Public License version 2 or later
+"""
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,7 +29,9 @@
 
 ################################################################################
 
-import psycopg2, time
+import psycopg2
+import time
+from daklib.dak_exceptions import DBUpdateError
 
 ################################################################################
 
@@ -57,8 +64,6 @@ def do_update(self):
         print "Pausing for five seconds ..."
         time.sleep (5)
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        print "FATAL: Unable to apply DM table update 1!"
-        print "Error Message: " + str(msg)
-        print "Database changes have been rolled back."
+        raise DBUpdateError("Unable to appy DM table updates, rollback issued. Error message : %s" % (str(msg)))