From a3ccb2a6bc6424d94c15822c070803ba695c9def Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Thu, 22 Nov 2012 08:52:42 +0100 Subject: [PATCH] Add ordering to component table and use this when checking policy This allows us to accept source-only into other components than {main,contrib,non-free}. Signed-off-by: Tollef Fog Heen --- dak/dakdb/update99.py | 70 +++++++++++++++++++++++++++++++++++++++++++ daklib/policy.py | 9 ++++-- 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 dak/dakdb/update99.py diff --git a/dak/dakdb/update99.py b/dak/dakdb/update99.py new file mode 100644 index 00000000..f701fb7c --- /dev/null +++ b/dak/dakdb/update99.py @@ -0,0 +1,70 @@ +#!/usr/bin/env python +# coding=utf8 + +""" +Add component ordering + +@contact: Debian FTP Master +@copyright: 2012 Varnish Software AS +@author: Tollef Fog Heen +@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 + +################################################################################ + +import psycopg2 +from daklib.dak_exceptions import DBUpdateError +from daklib.config import Config + +statements = [ +""" +ALTER TABLE component +ADD COLUMN ordering INTEGER UNIQUE +""", + +""" +CREATE SEQUENCE component_ordering_seq +INCREMENT BY 10 +START WITH 100 +OWNED BY component.ordering +""", +] + +################################################################################ +def do_update(self): + print __doc__ + try: + cnf = Config() + + c = self.db.cursor() + + for stmt in statements: + c.execute(stmt) + + for component in ('main', 'contrib', 'non-free'): + c.execute("UPDATE component SET ordering = nextval('component_ordering_seq') WHERE name = '{0}'".format(component)) + c.execute("UPDATE component SET ordering = nextval('component_ordering_seq') WHERE ordering IS NULL") + c.execute("""ALTER TABLE component ALTER COLUMN ordering SET NOT NULL""") + c.execute("""ALTER TABLE component ALTER COLUMN ordering SET DEFAULT nextval('component_ordering_seq')""") + + c.execute("UPDATE config SET value = '99' WHERE name = 'db_revision'") + + self.db.commit() + + except psycopg2.ProgrammingError as msg: + self.db.rollback() + raise DBUpdateError('Unable to apply sick update 99, rollback issued. Error message: {0}'.format(msg)) diff --git a/daklib/policy.py b/daklib/policy.py index cdff56a7..aeed9a2c 100644 --- a/daklib/policy.py +++ b/daklib/policy.py @@ -279,13 +279,18 @@ class PolicyQueueUploadHandler(object): )) components.add(component) + source = self.upload.source source_component = '(unknown)' - for component in ('main', 'contrib', 'non-free'): + for component, in self.session.query(Component.component_name).order_by(Component.ordering): if component in components: source_component = component break + else: + if source is not None: + if self._source_override(component) is not None: + source_component = component + break - source = self.upload.source if source is not None: override = self._source_override(source_component) if override is None: -- 2.39.5