X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=alyson;h=c26273f64d09082796ae8ba3ed57079efb6d6909;hb=777e75e96ebc6651f77c67fddade7e8d0bc5d592;hp=4344f7904f4022a19f2acae35452c7e7ceafdaba;hpb=bdc118e9c2371404457f05986a2645a2c8cfd099;p=dak.git

diff --git a/alyson b/alyson
index 4344f790..c26273f6 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, 2001  James Troup <james@nocrew.org>
-# $Id: alyson,v 1.5 2001-09-27 14:42:02 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: alyson,v 1.9 2002-05-14 15:28:53 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
@@ -40,14 +40,9 @@ def get (c, i):
 def main ():
     global Cnf, projectB;
 
-    apt_pkg.init();
+    Cnf = utils.get_conf()
 
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
-    Arguments = [('D',"debug","Alyson::Options::Debug", "IntVal"),
-                 ('h',"help","Alyson::Options::Help"),
-                 ('v',"version","Alyson::Options::Version")];
-    apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
+    apt_pkg.ParseCommandLine(Cnf,[],sys.argv);
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
@@ -116,7 +111,7 @@ def main ():
         description = get(Suite, "Description");
         projectB.query("INSERT INTO suite (suite_name, version, origin, description) VALUES ('%s', %s, %s, %s)"
                        % (string.lower(suite), version, origin, description));
-        for architecture in Cnf.SubTree("Suite::%s::Architectures" % (suite)).List():
+        for architecture in Cnf.ValueList("Suite::%s::Architectures" % (suite)):
             architecture_id = db_access.get_architecture_id (architecture);
             if architecture_id < 0:
                 utils.fubar("architecture '%s' not found in architecture table for suite %s." % (architecture, suite));
@@ -127,7 +122,7 @@ def main ():
 
     projectB.query("BEGIN WORK");
     projectB.query("DELETE FROM override_type");
-    for type in Cnf.SubTree("OverrideType").List():
+    for type in Cnf.ValueList("OverrideType"):
         projectB.query("INSERT INTO override_type (type) VALUES ('%s')" % (type));
     projectB.query("COMMIT WORK");
 
@@ -157,7 +152,7 @@ def main ():
                 suffix = '/' + component;
             else:
                 suffix = "";
-        for section in Cnf.SubTree("Section").List():
+        for section in Cnf.ValueList("Section"):
             projectB.query("INSERT INTO section (section) VALUES ('%s%s%s')" % (prefix, section, suffix));
     projectB.query("COMMIT WORK");