X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cindy;h=50f0e676cd805fc667677cfb79d45534fa6247dd;hb=9e78deadeefb78533360179077669f763f0f483c;hp=038a47964aa428b6226571320fa07fd8b8d12540;hpb=c1c7681bf43c58dd5cf34d1c1814a75ae594688b;p=dak.git diff --git a/cindy b/cindy index 038a4796..50f0e676 100755 --- a/cindy +++ b/cindy @@ -1,8 +1,8 @@ #!/usr/bin/env python -# Output override files for apt-ftparchive and indices/ -# Copyright (C) 2000, 2001 James Troup -# $Id: cindy,v 1.5 2001-11-04 22:28:44 troup Exp $ +# Cruft checker for overrides +# Copyright (C) 2000, 2001, 2002, 2004 James Troup +# $Id: cindy,v 1.13 2004-11-27 19:23:40 troup Exp $ # 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 @@ -20,25 +20,48 @@ ################################################################################ -# X-Listening-To: Sanitarium / Master of the Puppets - Metallica +###################################################################### +# NB: cindy is not a good idea with New Incoming as she doesn't take # +# into account accepted. You can minimize the impact of this by # +# running her immediately after kelly but that's still racy because # +# lisa doesn't lock with kelly. A better long term fix is the evil # +# plan for accepted to be in the DB. # +###################################################################### + +# NB[2]: cindy entirely breaks for suites that share overrides, +# e.g. experimental in Debian. + +# NB[3]: cindy ENTIRELY breaks for 'source-only'-upload based distros +# like Ubuntu. Go Cindy. ################################################################################ -import pg, sys, string -import utils, db_access, natalie +import pg, sys; +import utils, db_access; import apt_pkg; ################################################################################ Cnf = None; +Options = None; projectB = None; override = {} ################################################################################ +def usage (exit_code=0): + print """Usage: cindy +Check for cruft in overrides. + + -h, --help show this help and exit""" + + sys.exit(exit_code) + +################################################################################ + def process(suite, component, type): global override; - + suite_id = db_access.get_suite_id(suite); if suite_id == -1: utils.fubar("Suite '%s' not recognised." % (suite)); @@ -54,12 +77,22 @@ def process(suite, component, type): if type == "deb" or type == "udeb": packages = {}; - q = projectB.query("SELECT DISTINCT b.package FROM binaries b, bin_associations ba WHERE b.id = ba.bin AND ba.suite = %s" % (suite_id)); + q = projectB.query(""" +SELECT b.package FROM binaries b, bin_associations ba, files f, + location l, component c + WHERE b.id = ba.bin AND f.id = b.file AND l.id = f.location + AND c.id = l.component AND ba.suite = %s AND c.id = %s +""" % (suite_id, component_id)); for i in q.getresult(): packages[i[0]] = ""; src_packages = {}; - q = projectB.query("SELECT DISTINCT s.source FROM source s, src_associations sa WHERE s.id = sa.source AND sa.suite = %s" % (suite_id)); + q = projectB.query(""" +SELECT s.source FROM source s, src_associations sa, files f, location l, + 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 = %s AND c.id = %s +""" % (suite_id, component_id)); for i in q.getresult(): src_packages[i[0]] = ""; @@ -71,52 +104,55 @@ def process(suite, component, type): if not packages.has_key(package): if not src_packages.has_key(package): print "DELETING: %s" % (package); - #projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s" - #% (package, suite_id, component_id, type_id)); + if not Options["No-Action"]: + projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s" % (package, suite_id, component_id, type_id)); else: print "MAKING SOURCE: %s" % (package); - #projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s" - #% (package, suite_id, component_id, type_id)); + if not Options["No-Action"]: + projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s" % (package, suite_id, component_id, type_id)); # Then if source doesn't already have a copy, insert it into source q = projectB.query("SELECT package FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s" % (package, suite_id, component_id, dsc_type_id)); - if not q.getresult(): - #projectB.query("INSERT INTO override (package, suite, component, priority, section, type, maintainer) VALUES ('%s', %s, %s, %s, %s, %s, '%s')" % (package, suite_id, component_id, i[1], i[2], dsc_type_id, i[3])); - print "(nop)" + if not q.getresult() and not Options["No-Action"]: + projectB.query("INSERT INTO override (package, suite, component, priority, section, type, maintainer) VALUES ('%s', %s, %s, %s, %s, %s, '%s')" % (package, suite_id, component_id, i[1], i[2], dsc_type_id, i[3])); else: # dsc if not src_packages.has_key(package): print "DELETING: %s" % (package); - #projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s" - #% (package, suite_id, component_id, type_id)); + if not Options["No-Action"]: + projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s" % (package, suite_id, component_id, type_id)); projectB.query("COMMIT WORK"); - + ################################################################################ def main (): - global Cnf, projectB, override; + global Cnf, Options, projectB, override; - apt_pkg.init(); - - Cnf = apt_pkg.newConfiguration(); - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); - Arguments = [('D',"debug","Denise::Options::Debug", "IntVal"), - ('h',"help","Denise::Options::Help"), - ('V',"version","Denise::Options::Version")]; - apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); + Cnf = utils.get_conf() + + Arguments = [('h',"help","Cindy::Options::Help"), + ('n',"no-action", "Cindy::Options::No-Action")]; + for i in [ "help", "no-action" ]: + if not Cnf.has_key("Cindy::Options::%s" % (i)): + Cnf["Cindy::Options::%s" % (i)] = ""; + apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv); + Options = Cnf.SubTree("Cindy::Options") + + if Options["Help"]: + usage(); projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); - for suite in [ "stable", "unstable" ]: - print "Processing %s..." % (suite); - for component in Cnf.SubTree("Component").List(): - if component == "mixed": - continue; # Ick - for type in Cnf.SubTree("OverrideType").List(): - print "Processing %s [%s - %s]..." % (suite, component, type); - process(suite, component, type); + suite = "unstable" + print "Processing %s..." % (suite); + for component in Cnf.SubTree("Component").List(): + if component == "mixed": + continue; # Ick + for otype in Cnf.ValueList("OverrideType"): + print "Processing %s [%s - %s]..." % (suite, component, otype); + process(suite, component, otype); -####################################################################################### +################################################################################ if __name__ == '__main__': main()