X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=claire.py;h=e6681a5bf2031c30f8a8f62f8257a038faf5ad04;hb=5279af26b05d602c20f2e54b4674ad342801660c;hp=1c3784c6b3d6a922d7a010c32dc0e96cb33872a7;hpb=bb8283ad6274e461fc78a00b2a52c6594c53e13d;p=dak.git diff --git a/claire.py b/claire.py index 1c3784c6..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.1 2000-12-05 04:27:48 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,21 +18,38 @@ # 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' ################################################################################ -import pg, sys, os, string +import os, pg, re, string, sys import utils, db_access import apt_pkg; ################################################################################ +re_strip_section_prefix = re.compile(r'.*/'); + Cnf = None; 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): @@ -46,34 +63,101 @@ def clean_symlink (src, dest, root): ################################################################################ +def fix_component_section (component, section): + if component == "": + component = utils.extract_component_from_section(section)[1]; + + # FIXME: ugly hacks to work around override brain damage + section = re_strip_section_prefix.sub('', section); + section = string.replace(string.lower(section), 'non-us', ''); + if section == "main" or section == "contrib" or section == "non-free": + section = ''; + if section != '': + section = section + '/'; + + return (component, section); + +################################################################################ + def find_dislocated_stable(Cnf, projectB): dislocated_files = {} # Source - q = projectB.query("SELECT su.suite_name, c.name, s.id FROM suite su, src_associations sa, source s, files f, component c, location l WHERE su.suite_name = 'stable' AND sa.suite = su.id AND sa.source = s.id AND f.id = s.file AND f.location = l.id AND (l.component = c.id OR (l.component = NULL AND c.name = 'non-US/main')) AND NOT (f.filename ~ '^potato/');") + q = projectB.query(""" +SELECT DISTINCT ON (f.id) c.name, 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 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 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(): - q = projectB.query("SELECT l.path, f.filename, f.id FROM source s, files f, location l, dsc_files df WHERE s.id = %d AND df.source = %d AND f.id = df.file AND f.location = l.id AND NOT (f.filename ~ '^potato/')" % (i[2], i[2])); - for j in q.getresult(): - src = j[0]+j[1] - dest = Cnf["Dir::RootDir"]+'dists/'+i[0]+'/'+i[1]+'/source/'+os.path.basename(j[1]); - src = clean_symlink(src, dest, Cnf["Dir::RootDir"]); - if not os.path.exists(dest): - if Cnf.Find("Claire::Options::Verbose"): - print src+' -> '+dest - os.symlink(src, dest); - dislocated_files[j[2]] = dest; + src = i[2]+i[3] + (component, section) = fix_component_section(i[0], i[1]); + 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; # Binary - q = projectB.query("SELECT su.suite_name, c.name, a.arch_string, b.package, b.version, l.path, f.filename, f.id FROM suite su, bin_associations ba, binaries b, files f, component c, architecture a, location l WHERE ba.suite = su.id AND su.suite_name = 'stable' AND ba.bin = b.id AND f.id = b.file AND f.location = l.id AND (l.component = c.id OR (l.component = NULL and c.name = 'non-US/main')) AND b.architecture = a.id AND NOT (f.filename ~ '^potato/');"); + 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 + FROM architecture a, bin_associations ba, binaries b, component c, files f, + location l, override o, section sec, suite su + 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 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, + location l, override o, section sec, suite su + 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 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(): + (component, section) = fix_component_section(i[0], i[2]); + architecture = i[1]; + package = i[3] + version = utils.re_no_epoch.sub('', i[4]); src = i[5]+i[6] - dest = Cnf["Dir::RootDir"]+'dists/'+i[0]+'/'+i[1]+'/binary-'+i[2]+'/'+i[3]+'_'+utils.re_no_epoch.sub('', i[4])+'.deb' - 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 @@ -82,19 +166,21 @@ def find_dislocated_stable(Cnf, projectB): 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);