added extraoverrides (for Task: fields)

[dak.git] / alyson

diff --git a/alyson b/alyson
index 5e602ecdc31a9544292d6c51743ff718dee097d0..9801d596c6ce84c80fcbfe80408c0d9bed005ed9 100755 (executable)
--- 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.4 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
@@ -20,7 +20,7 @@
 
 ################################################################################
 
-import pg, sys
+import pg, sys, string
 import utils, db_access
 import apt_pkg;
 
@@ -43,7 +43,7 @@ def main ():
                  ('v',"version","Alyson::Options::Version")];
     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);
 
     # Quick hack to populate section, priority and bin_type; the rest todo later
@@ -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");