X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=julia;h=6cf0e46ae33765b50e28eb8a9d4569a13dac237d;hb=fb3d44c5e9b4a010f56cffd8fd5e35d6221805f9;hp=e7dff3bc40dcdc24aadf857f4e3e0754ee21122e;hpb=a2c442c5a39e20adb1be634b7bfcd0b875cbb2aa;p=dak.git

diff --git a/julia b/julia
index e7dff3bc..6cf0e46a 100755
--- a/julia
+++ b/julia
@@ -2,7 +2,7 @@
 
 # Sync PostgreSQL users with system users
 # Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
-# $Id: julia,v 1.7 2002-08-14 00:40:19 troup Exp $
+# $Id: julia,v 1.9 2003-01-02 18:12:50 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 pg, pwd, string, sys;
+import pg, pwd, sys;
 import utils;
 import apt_pkg;
 
@@ -41,13 +41,13 @@ projectB = None;
 ################################################################################
 
 def usage (exit_code=0):
-    print """Usage: julia [OPTION]... PASSWD_FILE
-Sync PostgreSQL's pg_user with PASSWD_FILE.
+    print """Usage: julia [OPTION]...
+Sync PostgreSQL's users with system users.
 
+  -h, --help                 show this help and exit
   -n, --no-action            don't do anything
   -q, --quiet                be quiet about what is being done
-  -v, --verbose              explain what is being done
-  -h, --help                 show this help and exit"""
+  -v, --verbose              explain what is being done"""
     sys.exit(exit_code)
 
 ################################################################################
@@ -95,8 +95,8 @@ def main ():
         postgres_unames[uname] = "";
 
     known_postgres_unames = {};
-    for i in string.split(Cnf.get("Julia::KnownPostgres",""),","):
-        uname = string.strip(i);
+    for i in Cnf.get("Julia::KnownPostgres","").split(","):
+        uname = i.strip();
         known_postgres_unames[uname] = "";
 
     keys = postgres_unames.keys()