X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=claire.py;h=c78086ea256ccf860883644c86eff2ea84994474;hb=b618ca40333f46edada83f0329f85cec83bca7eb;hp=3fcc9f1c65a1b9c6b23134fc46825e4202243728;hpb=62f80fe886360a984b5225c7aaa7637635335248;p=dak.git

diff --git a/claire.py b/claire.py
index 3fcc9f1c..c78086ea 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 <james@nocrew.org>
-# $Id: claire.py,v 1.3 2001-01-25 07:27:08 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: claire.py,v 1.7 2001-04-03 10:02:16 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
@@ -78,20 +78,20 @@ 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]));
+        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"]);
         if not os.path.exists(dest):
             if Cnf.Find("Claire::Options::Verbose"):
@@ -111,7 +111,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 +119,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():
@@ -129,7 +129,7 @@ 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/stable/%s/binary-%s/%s%s_%s.deb" % (Cnf["Dir::RootDir"], component, architecture, section, package, version);
+        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"]);
         if not os.path.exists(dest):
             if Cnf.Find("Claire::Options::Verbose"):
@@ -156,7 +156,7 @@ def main ():
 
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
 
     db_access.init(Cnf, projectB);