X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=halle;h=86d21ddf43f028dac6d0ce8269ad4635613549d9;hb=9cbf7a4115995f8684e30e60c16819c1c78e0431;hp=e1705958dcb25faee2e6a2ad0fe516edb9fa3ab0;hpb=f3adcc5ec038ffdbe4e34d9b96dca77a94cb0cf8;p=dak.git

diff --git a/halle b/halle
index e1705958..86d21ddf 100755
--- a/halle
+++ b/halle
@@ -2,7 +2,7 @@
 
 # Remove obsolete .changes files from proposed-updates
 # Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: halle,v 1.1 2001-11-04 20:41:50 troup Exp $
+# $Id: halle,v 1.3 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
@@ -144,10 +144,7 @@ ORDER BY package, version, arch_string;
 def main ():
     global Cnf, projectB, Options;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
     Arguments = [('q',"quiet","Halle::Options::Quiet"),
                  ('v',"verbose","Halle::Options::Verbose"),
@@ -155,14 +152,15 @@ def main ():
                  ('h',"help","Halle::Options::Help"),
                  ('V',"version","Halle::Options::Version")];
     for i in [ "quiet", "verbose", "help", "debug" ]:
-        Cnf["Halle::Options::%s" % (i)] = "";
+	if not Cnf.has_key("Halle::Options::%s" % (i)):
+	    Cnf["Halle::Options::%s" % (i)] = "";
 
     arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Halle::Options")
 
     if Options["Help"]:
         usage(0);
-    if arguments == []:
+    if not arguments:
         utils.fubar("need at least one package name as an argument.");
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));