Merge commit 'ftpmaster/master' into sqlalchemy

[dak.git] / dak / transitions.py

diff --git a/dak/transitions.py b/dak/transitions.py
index 33b744b3de1c377ac7cd3eb3e6abe970674e92e6..9c4e7d8bc7e97010b23d0dc1b21f349e723f2c93 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -29,7 +29,6 @@ Display, edit and check the release manager's transition file.
 ################################################################################
 
 import os
-import pg
 import sys
 import time
 import errno
@@ -37,6 +36,7 @@ import fcntl
 import tempfile
 import pwd
 import apt_pkg
+
 from daklib.dbconn import *
 from daklib import utils
 from daklib.dak_exceptions import TransitionsError
@@ -84,9 +84,7 @@ def init():
     if Options["help"]:
         usage()
 
-    whoami = os.getuid()
-    whoamifull = pwd.getpwuid(whoami)
-    username = whoamifull[0]
+    username = utils.getusername()
     if username != "dak":
         print "Non-dak user: %s" % username
         Options["sudo"] = "y"