From 3a1cfe1537896df8d9e5e85107075e69045546b2 Mon Sep 17 00:00:00 2001 From: James Troup Date: Wed, 5 Jun 2002 00:18:32 +0000 Subject: [PATCH] remove support for files in legacy-mixed locations --- claire.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/claire.py b/claire.py index e6681a5b..b4bdc118 100755 --- a/claire.py +++ b/claire.py @@ -2,7 +2,7 @@ # 'Fix' stable to make debian-cd and dpkg -BORGiE users happy # Copyright (C) 2000, 2001, 2002 James Troup -# $Id: claire.py,v 1.14 2002-05-14 15:28:53 troup Exp $ +# $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 @@ -92,15 +92,16 @@ 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]); -- 2.39.5