Merge remote-tracking branch 'ansgar/pu/multiarchive-2'

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

diff --git a/dak/dakdb/update39.py b/dak/dakdb/update39.py
index 558dc44fe119a3365c6c636f94c99e89215f9546..c02b9629f0d34536da1c2b5286754dfc5d289217 100644 (file)
--- a/dak/dakdb/update39.py
+++ b/dak/dakdb/update39.py
@@ -36,12 +36,12 @@ def do_update(self):
     print __doc__
     try:
         c = self.db.cursor()
-        c.execute("INSERT INTO config(name, value) VALUES ('exportpath', '/srv/ftp-master.debian.org/export/changelogs')")
+        c.execute("INSERT INTO config(name, value) VALUES ('exportpath', 'changelogs')")
         c.execute("ALTER TABLE suite ADD COLUMN changelog text NULL")
-        c.execute("UPDATE suite SET changelog = '/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog' WHERE suite_name = 'testing'")
+        c.execute("UPDATE suite SET changelog = 'dists/testing/ChangeLog' WHERE suite_name = 'testing'")
         c.execute("UPDATE config SET value = '39' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply table-column update 39, rollback issued. Error message : %s' % (str(msg))
+        raise DBUpdateError('Unable to apply table-column update 39, rollback issued. Error message : %s' % (str(msg)))