Merge commit 'godog/master' into merge

[dak.git] / dak / import_users_from_passwd.py

diff --git a/dak/import_users_from_passwd.py b/dak/import_users_from_passwd.py
old mode 100644 (file)
new mode 100755 (executable)
index fa34772..b182f60
--- a/dak/import_users_from_passwd.py
+++ b/dak/import_users_from_passwd.py
@@ -31,7 +31,7 @@
 
 import pg, pwd, sys
 import apt_pkg
-import daklib.utils
+from daklib import utils
 
 ################################################################################
 
@@ -54,7 +54,7 @@ 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"),
@@ -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"]))