X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=claire.py;h=e6681a5bf2031c30f8a8f62f8257a038faf5ad04;hb=30b41506a6105ab23a0cac9e8197475a89236224;hp=3fcc9f1c65a1b9c6b23134fc46825e4202243728;hpb=62f80fe886360a984b5225c7aaa7637635335248;p=dak.git diff --git a/claire.py b/claire.py index 3fcc9f1c..e6681a5b 100755 --- a/claire.py +++ b/claire.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # 'Fix' stable to make debian-cd and dpkg -BORGiE users happy -# Copyright (C) 2000 James Troup -# $Id: claire.py,v 1.3 2001-01-25 07:27:08 troup Exp $ +# Copyright (C) 2000, 2001, 2002 James Troup +# $Id: claire.py,v 1.14 2002-05-14 15:28:53 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 @@ -18,6 +18,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################ + # "Look around... leaves are brown... and the sky's a hazy shade of winter, # Look around... leaves are brown... there's a patch of snow on the ground." # -- Simon & Garfunkel / 'A Hazy Shade' @@ -37,6 +39,17 @@ projectB = None; ################################################################################ +def usage (exit_code=0): + print """Usage: claire [OPTIONS] +Create compatability symlinks from legacy locations to the pool. + + -v, --verbose explain what is being done + -h, --help show this help and exit""" + + sys.exit(exit_code) + +################################################################################ + # Relativize an absolute symlink from 'src' -> 'dest' relative to 'root'. # Returns fixed 'src' def clean_symlink (src, dest, root): @@ -52,7 +65,7 @@ def clean_symlink (src, dest, root): def fix_component_section (component, section): if component == "": - (None, component) = utils.extract_component_from_section(section); + component = utils.extract_component_from_section(section)[1]; # FIXME: ugly hacks to work around override brain damage section = re_strip_section_prefix.sub('', section); @@ -78,31 +91,32 @@ SELECT DISTINCT ON (f.id) c.name, sec.section, l.path, f.filename, f.id AND f2.id = s.file AND f2.location = l2.id AND df.source = s.id AND f.id = df.file AND f.location = l.id AND o.package = s.source AND sec.id = o.section AND NOT (f.filename ~ '^potato/') - AND l.component = c.id + AND l.component = c.id AND o.suite = su.id UNION SELECT DISTINCT ON (f.id) null, sec.section, l.path, f.filename, f.id FROM component c, override o, section sec, source s, files f, location l, dsc_files df, suite su, src_associations sa, files f2, location l2 WHERE su.suite_name = 'stable' AND sa.suite = su.id AND sa.source = s.id AND f2.id = s.file AND f2.location = l2.id AND df.source = s.id AND f.id = df.file AND f.location = l.id AND o.package = s.source - AND sec.id = o.section AND NOT (f.filename ~ '^potato/') + AND sec.id = o.section AND NOT (f.filename ~ '^potato/') AND o.suite = su.id AND NOT EXISTS (SELECT l.path FROM location l WHERE l.component IS NOT NULL AND f.location = l.id); """); for i in q.getresult(): src = i[2]+i[3] (component, section) = fix_component_section(i[0], i[1]); - dest = "%sdists/stable/%s/source/%s%s" % (Cnf["Dir::RootDir"], component, section, os.path.basename(i[3])); - src = clean_symlink(src, dest, Cnf["Dir::RootDir"]); + dest = "%sdists/%s/%s/source/%s%s" % (Cnf["Dir::Root"], Cnf.get("Suite::Stable::CodeName", "stable"), component, section, os.path.basename(i[3])); + src = clean_symlink(src, dest, Cnf["Dir::Root"]); if not os.path.exists(dest): if Cnf.Find("Claire::Options::Verbose"): print src+' -> '+dest os.symlink(src, dest); dislocated_files[i[4]] = dest; - #return dislocated_files; - - # TODO later when there's something to test it with! # Binary + architectures = Cnf.ValueList("Suite::Stable::Architectures"); + for arch in [ "source", "all" ]: + if architectures.count(arch): + architectures.remove(arch); q = projectB.query(""" SELECT DISTINCT ON (f.id) c.name, a.arch_string, sec.section, b.package, b.version, l.path, f.filename, f.id @@ -111,7 +125,7 @@ SELECT DISTINCT ON (f.id) c.name, a.arch_string, sec.section, b.package, WHERE su.suite_name = 'stable' AND ba.suite = su.id AND ba.bin = b.id AND f.id = b.file AND f.location = l.id AND o.package = b.package AND sec.id = o.section AND NOT (f.filename ~ '^potato/') - AND b.architecture = a.id AND l.component = c.id + AND b.architecture = a.id AND l.component = c.id AND o.suite = su.id UNION SELECT DISTINCT ON (f.id) null, a.arch_string, sec.section, b.package, b.version, l.path, f.filename, f.id FROM architecture a, bin_associations ba, binaries b, component c, files f, @@ -119,7 +133,7 @@ UNION SELECT DISTINCT ON (f.id) null, a.arch_string, sec.section, b.package, WHERE su.suite_name = 'stable' AND ba.suite = su.id AND ba.bin = b.id AND f.id = b.file AND f.location = l.id AND o.package = b.package AND sec.id = o.section AND NOT (f.filename ~ '^potato/') - AND b.architecture = a.id AND NOT EXISTS + AND b.architecture = a.id AND o.suite = su.id AND NOT EXISTS (SELECT l.path FROM location l WHERE l.component IS NOT NULL AND f.location = l.id); """); for i in q.getresult(): @@ -128,14 +142,22 @@ UNION SELECT DISTINCT ON (f.id) null, a.arch_string, sec.section, b.package, package = i[3] version = utils.re_no_epoch.sub('', i[4]); src = i[5]+i[6] - - dest = "%sdists/stable/%s/binary-%s/%s%s_%s.deb" % (Cnf["Dir::RootDir"], component, architecture, section, package, version); - src = clean_symlink(src, dest, Cnf["Dir::RootDir"]); + + dest = "%sdists/%s/%s/binary-%s/%s%s_%s.deb" % (Cnf["Dir::Root"], Cnf.get("Suite::Stable::CodeName", "stable"), component, architecture, section, package, version); + src = clean_symlink(src, dest, Cnf["Dir::Root"]); if not os.path.exists(dest): if Cnf.Find("Claire::Options::Verbose"): print src+' -> '+dest os.symlink(src, dest); dislocated_files[i[7]] = dest; + # Add per-arch symlinks for arch: all debs + if architecture == "all": + for arch in architectures: + dest = "%sdists/%s/%s/binary-%s/%s%s_%s.deb" % (Cnf["Dir::Root"], Cnf.get("Suite::Stable::CodeName", "stable"), component, arch, section, package, version); + if not os.path.exists(dest): + if Cnf.Find("Claire::Options::Verbose"): + print src+' -> '+dest + os.symlink(src, dest); return dislocated_files @@ -144,19 +166,21 @@ UNION SELECT DISTINCT ON (f.id) null, a.arch_string, sec.section, b.package, def main (): global Cnf, projectB; - apt_pkg.init(); - - Cnf = apt_pkg.newConfiguration(); - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); + Cnf = utils.get_conf() - Arguments = [('d',"debug","Claire::Options::Debug", "IntVal"), - ('h',"help","Claire::Options::Help"), - ('v',"verbose","Claire::Options::Verbose"), - ('V',"version","Claire::Options::Version")]; + Arguments = [('h',"help","Claire::Options::Help"), + ('v',"verbose","Claire::Options::Verbose")]; + for i in ["help", "verbose" ]: + if not Cnf.has_key("Claire::Options::%s" % (i)): + Cnf["Claire::Options::%s" % (i)] = ""; apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); + Options = Cnf.SubTree("Claire::Options") + + if Options["Help"]: + usage(); - projectB = pg.connect('projectb', 'localhost'); + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB);