X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=julia;h=07e436724629e448094194072f715e0afb59f9e9;hb=2bed9bb874f5258e91ffe9c54241141daba0ee77;hp=6d5ff3746c20caeff54399ee052644187ab4f028;hpb=a092f0aa8e82394e25a16da9e87263ee26b8de0e;p=dak.git

diff --git a/julia b/julia
index 6d5ff374..07e43672 100755
--- a/julia
+++ b/julia
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Sync PostgreSQL with (LDAP-generated) passwd file
-# Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: julia,v 1.2 2001-09-27 01:23:41 troup Exp $
+# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
+# $Id: julia,v 1.6 2002-05-03 16:06:45 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
@@ -30,7 +30,7 @@
 
 ################################################################################
 
-import os, pg, string, sys;
+import pg, string, sys;
 import utils;
 import apt_pkg;
 
@@ -54,23 +54,21 @@ Sync PostgreSQL's pg_user with PASSWD_FILE.
 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 = [('q',"quiet","Julia::Options::Quiet"),
                  ('v',"verbose","Julia::Options::Verbose"),
                  ('h',"help","Julia::Options::Help")];
     for i in ["quiet", "verbose", "help" ]:
-        Cnf["Julia::Options::%s" % (i)] = "";
+	if not Cnf.has_key("Julia::Options::%s" % (i)):
+	    Cnf["Julia::Options::%s" % (i)] = "";
 
     arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Julia::Options")
 
     if Options["Help"]:
         usage();
-    if arguments == []:
+    if not arguments:
         utils.warn("julia needs the name of the passwd file to sync with as an argument.");
         usage(1);
     elif len(arguments) > 1: