X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=alyson;h=2b55faa21b2498d542a762301df9916bbc0e004c;hb=faf42c1d777c994b83c27152e1d18c38ce7aa4f0;hp=5e602ecdc31a9544292d6c51743ff718dee097d0;hpb=43722e2ebdfdcc25098483f3fa05b7ee857b1466;p=dak.git

diff --git a/alyson b/alyson
index 5e602ecd..2b55faa2 100755
--- a/alyson
+++ b/alyson
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Sync the ISC configuartion file and the SQL database
-# Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: alyson,v 1.1 2001-01-10 05:58:26 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: alyson,v 1.3 2001-03-02 02:24:33 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
@@ -20,7 +20,7 @@
 
 ################################################################################
 
-import pg, sys
+import pg, sys, string
 import utils, db_access
 import apt_pkg;
 
@@ -63,12 +63,21 @@ def main ():
     projectB.query("BEGIN WORK");
     projectB.query("DELETE FROM section");
     for component in Cnf.SubTree("Component").List():
-        if component != 'main':
-            prefix = component + '/';
+        if Cnf["Natalie::ComponentPosition"] == "prefix":
+            suffix = "";
+            if component != 'main':
+                prefix = component + '/';
+            else:
+                prefix = "";
         else:
             prefix = "";
+            component = string.replace(component, "non-US/", "");
+            if component != 'main':
+                suffix = '/' + component;
+            else:
+                suffix = "";
         for section in Cnf.SubTree("Section").List():
-            projectB.query("INSERT INTO section (section) VALUES ('%s%s')" % (prefix, section));
+            projectB.query("INSERT INTO section (section) VALUES ('%s%s%s')" % (prefix, section, suffix));
     projectB.query("COMMIT WORK");