From: James Troup <james@nocrew.org>
Date: Thu, 25 Jan 2001 07:27:08 +0000 (+0000)
Subject: claire on non-us
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=62f80fe886360a984b5225c7aaa7637635335248;p=dak.git

claire on non-us
---

diff --git a/TODO b/TODO
index 4be2fbed..e66fbb38 100644
--- a/TODO
+++ b/TODO
@@ -4,17 +4,8 @@ TOFIX
 Urgent
 ------
 
-  o Claire needs to know about sections on auric
-
-  o maintainers file needs overrides
-
-  o need to have process_it run a big try: loop so that individual
-    package screws up don't kill the daily cron run.
-
   o Add an 'add' ability to melanie (? separate prog maybe)
 
-  o Make experimental work
-
   o fix katie's handling of source packages in different directories;
     e.g. if a package moves from main to contrib, the .orig.tar.gz
     needs to what? copy or be moved and old source removed; one of the
@@ -22,6 +13,12 @@ Urgent
 
   o fix ssh appearing in 3 packages files
 
+  o maintainers file needs overrides
+
+  o Make experimental work
+
+  o need to have process_it run a big try: loop so that individual
+    package screws up don't kill the daily cron run.
 
 Less Urgent
 -----------
diff --git a/claire.py b/claire.py
index 7a8dc908..3fcc9f1c 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  James Troup <james@nocrew.org>
-# $Id: claire.py,v 1.2 2001-01-25 06:00:07 troup Exp $
+# $Id: claire.py,v 1.3 2001-01-25 07:27:08 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 + '/';
 
@@ -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