X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=claire.py;h=ac146f0b1297b965f76632d7654b4a9f3bcd07b3;hb=2de8a16fabbb8edf646ba2acd4722f2e070df5e0;hp=7a8dc908b5b7757fee909083c4b409d3d62400a5;hpb=6c68616c83b577e687f91a6ee75a8139757f213f;p=dak.git

diff --git a/claire.py b/claire.py
index 7a8dc908..ac146f0b 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.2 2001-01-25 06:00:07 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: claire.py,v 1.6 2001-03-20 00:28:11 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
@@ -57,6 +57,8 @@ def fix_component_section (component, section):
     # 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 + '/';
 
@@ -89,7 +91,7 @@ UNION SELECT DISTINCT ON (f.id) null, sec.section, l.path, f.filename, f.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"):
@@ -97,7 +99,7 @@ UNION SELECT DISTINCT ON (f.id) null, sec.section, l.path, f.filename, f.id
             os.symlink(src, dest);
         dislocated_files[i[4]] = dest;
 
-    return dislocated_files;
+    #return dislocated_files;
 
     # TODO later when there's something to test it with!
     # Binary
@@ -127,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"):
@@ -154,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);