X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=claire.py;h=b4bdc1189f029fb0b2cf771c16912c712b46a354;hb=3a1cfe1537896df8d9e5e85107075e69045546b2;hp=131f83caae51819688156cb58f24e94b4d24358d;hpb=5fc7cefdb9b600c729ca5a82fd5b3a828f4fd370;p=dak.git diff --git a/claire.py b/claire.py index 131f83ca..b4bdc118 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, 2001 James Troup -# $Id: claire.py,v 1.8 2001-09-27 01:22:51 troup Exp $ +# Copyright (C) 2000, 2001, 2002 James Troup +# $Id: claire.py,v 1.15 2002-06-05 00:18:32 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 @@ -65,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); @@ -92,20 +92,21 @@ SELECT DISTINCT ON (f.id) c.name, sec.section, l.path, f.filename, f.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); """); +# Only needed if you have files in legacy-mixed locations +# 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(): src = i[2]+i[3] (component, section) = fix_component_section(i[0], i[1]); - dest = "%sdists/%s/%s/source/%s%s" % (Cnf["Dir::RootDir"], Cnf.get("Suite::Stable::CodeName", "stable"), 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 @@ -113,6 +114,10 @@ UNION SELECT DISTINCT ON (f.id) null, sec.section, l.path, f.filename, f.id dislocated_files[i[4]] = dest; # 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 @@ -139,13 +144,21 @@ UNION SELECT DISTINCT ON (f.id) null, a.arch_string, sec.section, b.package, version = utils.re_no_epoch.sub('', i[4]); src = i[5]+i[6] - dest = "%sdists/%s/%s/binary-%s/%s%s_%s.deb" % (Cnf["Dir::RootDir"], Cnf.get("Suite::Stable::CodeName", "stable"), 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 @@ -154,15 +167,13 @@ 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 = [('h',"help","Claire::Options::Help"), ('v',"verbose","Claire::Options::Verbose")]; for i in ["help", "verbose" ]: - Cnf["Claire::Options::%s" % (i)] = ""; + 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")