make claire use the codename (potato) in the path to files rather thanthe suite name...

diff --git a/claire.py b/claire.py
index 3fcc9f1c65a1b9c6b23134fc46825e4202243728..e5711969f7c2d760efc61fd72ff8076bd99de181 100755 (executable)
--- a/claire.py
+++ b/claire.py
@@ -2,7 +2,7 @@
 
 # '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 $
+# $Id: claire.py,v 1.4 2001-02-27 06:10:42 ajt 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
@@ -91,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"):
@@ -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"):

diff --git a/katie.conf b/katie.conf
index 32d5ce2b0d4ef968e8fedccb4e987de1718e3ae5..d521d73cb2e7cb3e903c13729412ee68739510f4 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -282,6 +282,7 @@ Suite
        };
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
+       CodeName "woody";
        OverrideCodeName "woody";
        Priority "3";
   };

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 290f2d87af5149fc84c1b1daf9f3dc38e96af796..5d1ce71073388505ceb8038efa83cad807f250d6 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -268,6 +268,7 @@ Suite
        };
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
+       CodeName "woody";
        OverrideCodeName "woody";
        Priority "3";
   };