"Copies the installer from one suite to another"),
("override-disparity",
"Generate a list of override disparities"),
+ ("external-overrides",
+ "Modify external overrides"),
]
return functionality
--- /dev/null
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Add external_overrides
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2011 Ansgar Burchardt <ansgar@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
+# 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
+
+################################################################################
+def do_update(self):
+ """
+ Add external_overrides
+ """
+ print __doc__
+ try:
+ c = self.db.cursor()
+
+ c.execute("""
+ CREATE TABLE external_overrides (
+ package TEXT NOT NULL,
+ key TEXT NOT NULL,
+ value TEXT NOT NULL,
+ PRIMARY KEY (package, key)
+ )""");
+
+ c.execute("GRANT SELECT, UPDATE, INSERT, DELETE ON external_overrides TO ftpmaster");
+ c.execute("GRANT SELECT ON external_overrides TO public");
+
+ c.execute("UPDATE config SET value = '59' WHERE name = 'db_revision'")
+ self.db.commit()
+
+ except psycopg2.ProgrammingError, msg:
+ self.db.rollback()
+ raise DBUpdateError, 'Unable to apply sick update 59, rollback issued. Error message : %s' % (str(msg))
--- /dev/null
+#!/usr/bin/python
+
+"""
+Modify external overrides.
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2011 Ansgar Burchardt <ansgar@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
+# 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
+
+from daklib.dbconn import *
+from daklib.config import Config
+from daklib import utils, daklog
+
+import apt_pkg
+import sys
+
+def usage():
+ print """Usage: dak external-overrides COMMAND
+Modify external overrides.
+
+ -h, --help show this help and exit.
+
+Commands can use a long or abbreviated form:
+
+ remove KEY remove external overrides for KEY
+ rm KEY
+
+ import KEY import external overrides for KEY
+ i KEY NOTE: This will replace existing overrides.
+
+ show-key KEY show external overrides for KEY
+ s-k KEY
+
+ show-package PACKAGE show external overrides for PACKAGE
+ s-p PACKAGE
+
+For the 'import' command, external overrides are read from standard input and
+should be given as lines of the form 'PACKAGE KEY VALUE'.
+"""
+ sys.exit()
+
+#############################################################################
+
+def external_overrides_import(key, file):
+ session = DBConn().session()
+
+ session.query(ExternalOverride).filter_by(key=key).delete()
+
+ for line in file:
+ (package, key, value) = line.strip().split(None, 2)
+ eo = ExternalOverride()
+ eo.package = package
+ eo.key = key
+ eo.value = value
+ session.add(eo)
+
+ session.commit()
+
+#############################################################################
+
+def main():
+ cnf = Config()
+
+ Arguments = [('h',"help","External-Overrides::Options::Help")]
+
+ (command, arg) = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+ try:
+ Options = cnf.SubTree("External-Overrides::Options")
+ except KeyError:
+ Options = {}
+
+ if Options.has_key("Help"):
+ usage()
+
+ logger = daklog.Logger(cnf, 'external-overrides')
+
+ if command in ('import', 'i'):
+ external_overrides_import(arg, sys.stdin)
+ else:
+ print "E: Unknown commands."
+
+if __name__ == '__main__':
+ main()
bm.bin_id = tmp.binary_id
AND key != 'Section' AND key != 'Priority'
)
+ || COALESCE(E'\n' || (SELECT
+ STRING_AGG(key || '\: ' || value, E'\n' ORDER BY key)
+ FROM external_overrides eo
+ WHERE eo.package = tmp.package
+ ), '')
|| E'\nSection\: ' || sec.section
|| E'\nPriority\: ' || pri.priority
|| E'\nFilename\: pool/' || tmp.filename
def action(u, session):
+ global Logger
+
cnf = Config()
holding = Holding()
u.do_reject(0, pi)
elif answer == 'A':
if not chg:
- chg = u.pkg.add_known_changes(holding.holding_dir, session=session)
+ chg = u.pkg.add_known_changes(holding.holding_dir, session=session, logger=Logger)
session.commit()
u.accept(summary, short_summary, session)
u.check_override()
u.remove()
elif answer == 'P':
if not chg:
- chg = u.pkg.add_known_changes(holding.holding_dir, session=session)
+ chg = u.pkg.add_known_changes(holding.holding_dir, session=session, logger=Logger)
package_to_queue(u, summary, short_summary, policyqueue, chg, session)
session.commit()
u.remove()
elif answer == queuekey:
if not chg:
- chg = u.pkg.add_known_changes(holding.holding_dir, session=session)
+ chg = u.pkg.add_known_changes(holding.holding_dir, session=session, logger=Logger)
QueueInfo[qu]["process"](u, summary, short_summary, chg, session)
session.commit()
u.remove()
################################################################################
Cnf = None
-required_database_schema = 58
+required_database_schema = 59
################################################################################
if (not self.changes.has_key(key)) or (not self.changes[key]):
self.changes[key]='missing'
- def __get_file_from_pool(self, filename, entry, session):
+ def __get_file_from_pool(self, filename, entry, session, logger):
cnf = Config()
if cnf.has_key("Dinstall::SuiteSuffix"):
session=session)
if found is None:
- Logger.log(["E: Found multiple files for pool (%s) for %s" % (filename, component)])
+ if logger is not None:
+ logger.log(["E: Found multiple files for pool (%s) for %s" % (filename, component)])
return None
elif found is False and poolfile is not None:
- Logger.log(["E: md5sum/size mismatch for %s in pool" % (filename)])
+ if logger is not None:
+ logger.log(["E: md5sum/size mismatch for %s in pool" % (filename)])
return None
else:
if poolfile is None:
- Logger.log(["E: Could not find %s in pool" % (filename)])
+ if logger is not None:
+ logger.log(["E: Could not find %s in pool" % (filename)])
return None
else:
return poolfile
@session_wrapper
- def add_known_changes(self, dirpath, in_queue=None, session=None):
+ def add_known_changes(self, dirpath, in_queue=None, session=None, logger=None):
"""add "missing" in fields which we will require for the known_changes table"""
cnf = Config()
continue
entry['source'] = self.changes['source']
- poolfile = self.__get_file_from_pool(name, entry, session)
+ poolfile = self.__get_file_from_pool(name, entry, session, logger)
if poolfile:
chg.poolfiles.append(poolfile)
################################################################################
+class ExternalOverride(ORMObject):
+ def __init__(self, *args, **kwargs):
+ pass
+
+ def __repr__(self):
+ return '<ExternalOverride %s = %s: %s>' % (self.package, self.key, self.value)
+
+__all__.append('ExternalOverride')
+
+################################################################################
+
class PoolFile(ORMObject):
def __init__(self, filename = None, location = None, filesize = -1, \
md5sum = None):
'changes_pending_source_files',
'changes_pool_files',
'dsc_files',
+ 'external_overrides',
'extra_src_references',
'files',
'fingerprint',
poolfile_id = self.tbl_dsc_files.c.file,
poolfile = relation(PoolFile)))
+ mapper(ExternalOverride, self.tbl_external_overrides)
+
mapper(PoolFile, self.tbl_files,
properties = dict(file_id = self.tbl_files.c.id,
filesize = self.tbl_files.c.size,
projects / dak.git / commitdiff