X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jeri;h=ea813541d3fb868701fe987589d962107948657d;hb=fc1e81cf87861694e19b96afa8dd849dd967343c;hp=ba7209d6cf59ac54e2f07b218a38160273ce71c9;hpb=f3adcc5ec038ffdbe4e34d9b96dca77a94cb0cf8;p=dak.git

diff --git a/jeri b/jeri
index ba7209d6..ea813541 100755
--- a/jeri
+++ b/jeri
@@ -2,7 +2,7 @@
 
 # Dependency check proposed-updates
 # Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: jeri,v 1.1 2001-11-04 20:41:50 troup Exp $
+# $Id: jeri,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
@@ -268,10 +268,7 @@ def parse_packages():
 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","Jeri::Options::Quiet"),
                  ('v',"verbose","Jeri::Options::Verbose"),
@@ -279,14 +276,15 @@ def main ():
                  ('h',"help","Jeri::Options::Help"),
                  ('V',"version","Jeri::Options::Version")];
     for i in [ "quiet", "verbose", "help", "debug" ]:
-        Cnf["Jeri::Options::%s" % (i)] = "";
+	if not Cnf.has_key("Jeri::Options::%s" % (i)):
+	    Cnf["Jeri::Options::%s" % (i)] = "";
 
     arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Jeri::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"]));