#!/usr/bin/env python
-# Cruft checker and hole filler for overrides
+""" Cruft checker and hole filler for overrides """
# Copyright (C) 2000, 2001, 2002, 2004, 2006 James Troup <james@nocrew.org>
# Copyright (C) 2005 Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
################################################################################
import pg, sys, os
-import dak.lib.utils, dak.lib.database, dak.lib.logging
import apt_pkg
+from daklib import database
+from daklib import logging
+from daklib import utils
################################################################################
def process(osuite, affected_suites, originosuite, component, type):
global Logger, Options, projectB, sections, priorities
- osuite_id = dak.lib.database.get_suite_id(osuite)
+ osuite_id = database.get_suite_id(osuite)
if osuite_id == -1:
- dak.lib.utils.fubar("Suite '%s' not recognised." % (osuite))
+ utils.fubar("Suite '%s' not recognised." % (osuite))
originosuite_id = None
if originosuite:
- originosuite_id = dak.lib.database.get_suite_id(originosuite)
+ originosuite_id = database.get_suite_id(originosuite)
if originosuite_id == -1:
- dak.lib.utils.fubar("Suite '%s' not recognised." % (originosuite))
+ utils.fubar("Suite '%s' not recognised." % (originosuite))
- component_id = dak.lib.database.get_component_id(component)
+ component_id = database.get_component_id(component)
if component_id == -1:
- dak.lib.utils.fubar("Component '%s' not recognised." % (component))
+ utils.fubar("Component '%s' not recognised." % (component))
- type_id = dak.lib.database.get_override_type_id(type)
+ type_id = database.get_override_type_id(type)
if type_id == -1:
- dak.lib.utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (type))
- dsc_type_id = dak.lib.database.get_override_type_id("dsc")
- deb_type_id = dak.lib.database.get_override_type_id("deb")
+ utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (type))
+ dsc_type_id = database.get_override_type_id("dsc")
- source_priority_id = dak.lib.database.get_priority_id("source")
+ source_priority_id = database.get_priority_id("source")
if type == "deb" or type == "udeb":
packages = {}
location l, component c
WHERE b.type = '%s' AND b.id = ba.bin AND f.id = b.file AND l.id = f.location
AND c.id = l.component AND ba.suite IN (%s) AND c.id = %s
-""" % (type, ",".join(map(str,affected_suites)), component_id))
+""" % (type, ",".join([ str(i) for i in affected_suites ]), component_id))
for i in q.getresult():
packages[i[0]] = 0
component c
WHERE s.id = sa.source AND f.id = s.file AND l.id = f.location
AND c.id = l.component AND sa.suite IN (%s) AND c.id = %s
-""" % (",".join(map(str,affected_suites)), component_id))
+""" % (",".join([ str(i) for i in affected_suites]), component_id))
for i in q.getresult():
src_packages[i[0]] = 0
src_packages[package] = 1
else:
if blacklist.has_key(package):
- dak.lib.utils.warn("%s in incoming, not touching" % package)
+ utils.warn("%s in incoming, not touching" % package)
continue
Logger.log(["removing unused override", osuite, component,
type, package, priorities[i[1]], sections[i[2]], i[3]])
if not src_packages.has_key(package) or src_packages[package]:
continue
src_packages[package] = 1
-
+
Logger.log(["add missing override", osuite, component,
type, package, "source", sections[i[2]], i[3]])
if not Options["No-Action"]:
for package, hasoverride in src_packages.items():
if not hasoverride:
- dak.lib.utils.warn("%s has no override!" % package)
+ utils.warn("%s has no override!" % package)
else: # binary override
for i in q.getresult():
packages[package] = 1
else:
if blacklist.has_key(package):
- dak.lib.utils.warn("%s in incoming, not touching" % package)
+ utils.warn("%s in incoming, not touching" % package)
continue
Logger.log(["removing unused override", osuite, component,
type, package, priorities[i[1]], sections[i[2]], i[3]])
for package, hasoverride in packages.items():
if not hasoverride:
- dak.lib.utils.warn("%s has no override!" % package)
+ utils.warn("%s has no override!" % package)
projectB.query("COMMIT WORK")
sys.stdout.flush()
def main ():
global Logger, Options, projectB, sections, priorities
- Cnf = dak.lib.utils.get_conf()
+ Cnf = utils.get_conf()
Arguments = [('h',"help","Check-Overrides::Options::Help"),
('n',"no-action", "Check-Overrides::Options::No-Action")]
usage()
projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
- dak.lib.database.init(Cnf, projectB)
+ database.init(Cnf, projectB)
# init sections, priorities:
q = projectB.query("SELECT id, section FROM section")
priorities[i[0]] = i[1]
if not Options["No-Action"]:
- Logger = dak.lib.logging.Logger(Cnf, "check-overrides")
+ Logger = logging.Logger(Cnf, "check-overrides")
else:
- Logger = dak.lib.logging.Logger(Cnf, "check-overrides", 1)
+ Logger = logging.Logger(Cnf, "check-overrides", 1)
gen_blacklist(Cnf["Dir::Queue::Accepted"])
print "Processing %s%s..." % (osuite, originremark)
# Get a list of all suites that use the override file of 'osuite'
- ocodename = Cnf["Suite::%s::codename" % osuite]
+ ocodename = Cnf["Suite::%s::codename" % osuite].lower()
suites = []
for suite in Cnf.SubTree("Suite").List():
- if ocodename == Cnf["Suite::%s::OverrideCodeName" % suite]:
+ if ocodename == Cnf["Suite::%s::OverrideCodeName" % suite].lower():
suites.append(suite)
q = projectB.query("SELECT id FROM suite WHERE suite_name in (%s)" \
- % ", ".join(map(repr, suites)).lower())
+ % ", ".join([ repr(i) for i in suites ]).lower())
suiteids = []
for i in q.getresult():
suiteids.append(i[0])
-
+
if len(suiteids) != len(suites) or len(suiteids) < 1:
- dak.lib.utils.fubar("Couldn't find id's of all suites: %s" % suites)
+ utils.fubar("Couldn't find id's of all suites: %s" % suites)
for component in Cnf.SubTree("Component").List():
if component == "mixed":
if __name__ == '__main__':
main()
-
projects / dak.git / blobdiff