X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=andrea;h=8e3bb5c72276505aa16083005c69cbca4d8d8936;hb=c846e77a848d60dd115f00faa0d9a854161d99eb;hp=b678d9de3e08301722cb19d09bc70d7d30a988c5;hpb=a092f0aa8e82394e25a16da9e87263ee26b8de0e;p=dak.git

diff --git a/andrea b/andrea
index b678d9de..8e3bb5c7 100755
--- a/andrea
+++ b/andrea
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Check for fixable discrepancies between stable and unstable
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: andrea,v 1.4 2001-09-27 01:23:41 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: andrea,v 1.8 2002-10-16 02:47:32 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
@@ -21,7 +21,7 @@
 
 ################################################################################
 
-import pg, string, sys;
+import pg, sys;
 import utils, db_access;
 import apt_pkg;
 
@@ -35,10 +35,7 @@ projectB = None;
 def main ():
     global Cnf, projectB;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
     apt_pkg.ParseCommandLine(Cnf,[],sys.argv);
 
@@ -53,7 +50,7 @@ def main ():
     arch_all_id = db_access.get_architecture_id("all");
     dsc_type_id = db_access.get_override_type_id("dsc");
 
-    for arch in Cnf.SubTree("Suite::%s::Architectures" % (src_suite)).List():
+    for arch in Cnf.ValueList("Suite::%s::Architectures" % (src_suite)):
         if arch == "source":
             continue;
 
@@ -79,7 +76,7 @@ SELECT b_src.package, b_src.version, a.arch_string
 ORDER BY b_src.package;"""
                            % (src_suite_id, arch_id, dst_suite_id, dsc_type_id, arch_id, arch_all_id, dst_suite_id, dst_suite_id));
         for i in q.getresult():
-            print string.join(i, ' ');
+            print " ".join(i);
 
 #######################################################################################