two bug fixes in source_exists changes

[dak.git] / andrea

diff --git a/andrea b/andrea
index 5c32e3ae90abadc2ee6f7305d3955f4e4ac3a5c6..97a1a55756cd2e16ba468543112c555fe8f14cf0 100755 (executable)
--- a/andrea
+++ b/andrea
@@ -2,7 +2,7 @@
 
 # Check for fixable discrepancies between stable and unstable
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: andrea,v 1.6 2002-05-03 16:06:45 troup Exp $
+# $Id: andrea,v 1.9 2003-01-02 18:10:02 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;
 
@@ -32,12 +32,29 @@ projectB = None;
 
 ################################################################################
 
+def usage(exit_code=0):
+    print """Usage: andrea
+Looks for fixable descrepancies between stable and unstable.
+
+  -h, --help                show this help and exit."""
+    sys.exit(exit_code)
+
+################################################################################
+
 def main ():
     global Cnf, projectB;
 
-    Cnf = utils.get_conf()
+    Cnf = utils.get_conf();
+    Arguments = [('h',"help","Andrea::Options::Help")];
+    for i in [ "help" ]:
+       if not Cnf.has_key("Andrea::Options::%s" % (i)):
+           Cnf["Andrea::Options::%s" % (i)] = "";
+
+    apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv);
 
-    apt_pkg.ParseCommandLine(Cnf,[],sys.argv);
+    Options = Cnf.SubTree("Andrea::Options")
+    if Options["Help"]:
+       usage();
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
@@ -50,7 +67,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;
 
@@ -76,7 +93,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);
 
 #######################################################################################