non-US multi-sig in Release.gpg and 2.2r5

[dak.git] / madison

diff --git a/madison b/madison
index 47e33f6aeb17f7985df6eded70d5795490585923..a04615130fd2ef442eac853635d7e80285c316e5 100755 (executable)
--- a/madison
+++ b/madison
@@ -2,7 +2,7 @@
 
 # Display information about package(s) (suite, version, etc.)
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: madison,v 1.12 2001-11-04 22:35:11 troup Exp $
+# $Id: madison,v 1.13 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
@@ -65,16 +65,14 @@ Both ARCH and SUITE can be space seperated lists, e.g.
 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 = [('a',"architecture","Madison::Options::Architecture", "HasArg"),
                  ('s',"suite","Madison::Options::Suite", "HasArg"),
                  ('h',"help","Madison::Options::Help")];
     for i in ["architecture", "suite", "help" ]:
-        Cnf["Madison::Options::%s" % (i)] = "";
+       if not Cnf.has_key("Madison::Options::%s" % (i)):
+           Cnf["Madison::Options::%s" % (i)] = "";
 
     packages = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Madison::Options")