X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport_users_from_passwd.py;h=d38a3c93fa3b9a982fa497abcd216a6ba4752f5b;hb=7c40371fd5e818e0bad7edfa92267d663adf4993;hp=6ccda55fb84786e9615548253b47acfc11c29a82;hpb=e2ae71066cbb134753d7bfceb16e87d0b76dfd6e;p=dak.git

diff --git a/dak/import_users_from_passwd.py b/dak/import_users_from_passwd.py
index 6ccda55f..d38a3c93 100755
--- a/dak/import_users_from_passwd.py
+++ b/dak/import_users_from_passwd.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Sync PostgreSQL users with system users
+""" Sync PostgreSQL users with system users """
 # Copyright (C) 2001, 2002, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -30,8 +30,8 @@
 ################################################################################
 
 import pg, pwd, sys
-import utils
 import apt_pkg
+from daklib import utils
 
 ################################################################################
 
@@ -54,15 +54,15 @@ Sync PostgreSQL's users with system users.
 def main ():
     global Cnf, projectB
 
-    Cnf = daklib.utils.get_conf()
+    Cnf = utils.get_conf()
 
     Arguments = [('n', "no-action", "Import-Users-From-Passwd::Options::No-Action"),
                  ('q', "quiet", "Import-Users-From-Passwd::Options::Quiet"),
                  ('v', "verbose", "Import-Users-From-Passwd::Options::Verbose"),
                  ('h', "help", "Import-Users-From-Passwd::Options::Help")]
     for i in [ "no-action", "quiet", "verbose", "help" ]:
-	if not Cnf.has_key("Import-Users-From-Passwd::Options::%s" % (i)):
-	    Cnf["Import-Users-From-Passwd::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Import-Users-From-Passwd::Options::%s" % (i)):
+            Cnf["Import-Users-From-Passwd::Options::%s" % (i)] = ""
 
     arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
     Options = Cnf.SubTree("Import-Users-From-Passwd::Options")
@@ -70,7 +70,7 @@ def main ():
     if Options["Help"]:
         usage()
     elif arguments:
-        daklib.utils.warn("dak import-users-from-passwd takes no non-option arguments.")
+        utils.warn("dak import-users-from-passwd takes no non-option arguments.")
         usage(1)
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
@@ -117,4 +117,3 @@ def main ():
 
 if __name__ == '__main__':
     main()
-