From: Joerg Jaspert Date: Sun, 19 Sep 2010 14:38:56 +0000 (+0200) Subject: Remove commentsdir X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05cf023793b0b7ad270afbaf9958e1cb0cae5ef6;p=dak Remove commentsdir Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/dak.conf b/config/debian/dak.conf index a4dd9631..0d094c93 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -205,7 +205,6 @@ Suite contrib; non-free; }; - CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/"; OverrideSuite "stable"; ValidTime 604800; // 7 days VersionChecks diff --git a/dak/dakdb/update38.py b/dak/dakdb/update38.py new file mode 100755 index 00000000..583aa3ad --- /dev/null +++ b/dak/dakdb/update38.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# coding=utf8 + +""" +Remove more unused table columns + +@contact: Debian FTP Master +@copyright: 2010 Joerg Jaspert +@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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +################################################################################ + + +# everyone - send your condolences to twerner, a new ftpmaster +# twerner: you poor, poor bastard +# twerner: look what it's done to me and Ganneff +# he used to be only 1.3m tall and I used to be female +# twerner: Congratulations... Uhm... Thorsta? +# Thorstine? +# Thorstine seems the name of a candy we eat in Italy + +################################################################################ + +import psycopg2 +from daklib.dak_exceptions import DBUpdateError + +################################################################################ +def do_update(self): + """ + Remove unused table columns + """ + print __doc__ + try: + c = self.db.cursor() + c.execute('ALTER TABLE suite DROP COLUMN commentsdir') + c.execute("UPDATE config SET value = '38' WHERE name = 'db_revision'") + self.db.commit() + + except psycopg2.ProgrammingError, msg: + self.db.rollback() + raise DBUpdateError, 'Unable to apply table-column update 38, rollback issued. Error message : %s' % (str(msg)) diff --git a/dak/update_db.py b/dak/update_db.py index 10466070..11e5b1e0 100755 --- a/dak/update_db.py +++ b/dak/update_db.py @@ -45,7 +45,7 @@ from daklib.dak_exceptions import DBUpdateError ################################################################################ Cnf = None -required_database_schema = 37 +required_database_schema = 38 ################################################################################ diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 817afb26..f8c53760 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -2483,7 +2483,6 @@ SUITE_FIELDS = [ ('SuiteName', 'suite_name'), ('Priority', 'priority'), ('NotAutomatic', 'notautomatic'), ('CopyChanges', 'copychanges'), - ('CommentsDir', 'commentsdir'), ('OverrideSuite', 'overridesuite')] class Suite(object):