X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fnew_security_install.py;h=549fe5b57633779f51740c2cf2123ccfb582cc16;hb=94cc1127c3671302f795b49e0f69aaca760ac30b;hp=d674befd4f6a639f5f35d62bacf32a691687f650;hpb=fdf3c42445b4f11f4cd71634dd2b57cb7d7a4f36;p=dak.git

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index d674befd..549fe5b5 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -60,9 +60,7 @@ def init():
 
     Options = Cnf.SubTree("Security-Install::Options")
 
-    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"
@@ -303,7 +301,10 @@ def remove_from_buildd(suites, filename):
         try:
             os.unlink(os.path.join(builddbase, s, filebase))
         except OSError, e:
-            utils.warn("Problem removing %s from buildd queue %s [%s]" % (filebase, s, str(e)))
+            pass
+            # About no value printing this warning - it only confuses the security team,
+            # yet makes no difference otherwise.
+            #utils.warn("Problem removing %s from buildd queue %s [%s]" % (filebase, s, str(e)))
 
 
 def generate_advisory(template):