X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=andrea;h=be7e9b32f923652e9be9f7287b0bf32b0635c0e4;hb=9206877b2e652ff6b88e3d992205270c45600c5c;hp=baa168605a4738c33e5d24cf2f9e8b8a7d4f4053;hpb=f963ffb12e516b2ce54f1c310fd8843668593a54;p=dak.git

diff --git a/andrea b/andrea
index baa16860..be7e9b32 100755
--- a/andrea
+++ b/andrea
@@ -2,7 +2,7 @@
 
 # Check for fixable discrepancies between stable and unstable
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: andrea,v 1.2 2001-03-02 02:47:29 troup Exp $
+# $Id: andrea,v 1.5 2001-11-18 19:57:58 rmurray 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
@@ -35,18 +35,11 @@ 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()
 
-    Arguments = [('D',"debug","Catherine::Options::Debug", "IntVal"),
-                 ('h',"help","Catherine::Options::Help"),
-                 ('V',"version","Catherine::Options::Version")]
+    apt_pkg.ParseCommandLine(Cnf,[],sys.argv);
 
-    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);
 
     src_suite = "stable";
@@ -73,12 +66,12 @@ SELECT b_src.package, b_src.version, a.arch_string
   FROM binaries b_src, bin_associations ba, override o, architecture a
   WHERE ba.bin = b_src.id AND ba.suite = %s AND b_src.architecture = %s
         AND a.id = b_src.architecture AND o.package = b_src.package
-        AND o.suite = %s AND o.type != %s AND NOT EXISTS 
-    (SELECT b_dst.id FROM bin_associations ba2, binaries b_dst 
-       WHERE ba2.bin = b_dst.id AND b_dst.package = b_src.package 
-             AND (b_dst.architecture = %s OR b_dst.architecture = %s) 
-             AND ba2.suite = %s AND EXISTS 
-               (SELECT b2.id FROM bin_associations ba3, binaries b2 
+        AND o.suite = %s AND o.type != %s AND NOT EXISTS
+    (SELECT b_dst.id FROM bin_associations ba2, binaries b_dst
+       WHERE ba2.bin = b_dst.id AND b_dst.package = b_src.package
+             AND (b_dst.architecture = %s OR b_dst.architecture = %s)
+             AND ba2.suite = %s AND EXISTS
+               (SELECT b2.id FROM bin_associations ba3, binaries b2
                   WHERE ba3.bin = b2.id AND ba3.suite = %s AND b2.package = b_dst.package))
 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));