import apt_pkg, os, sys, pwd, time, commands
from daklib import queue
-from daklib import logging
+from daklib import daklog
from daklib import utils
from daklib import database
from daklib.regexes import re_taint_free
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"
if Options["No-Action"]:
Options["Sudo"] = ""
if not Options["Sudo"] and not Options["No-Action"]:
- Logger = Upload.Logger = logging.Logger(Cnf, "new-security-install")
+ Logger = Upload.Logger = daklog.Logger(Cnf, "new-security-install")
return arguments
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):