#!/usr/bin/env python
-# Wrapper for Debian Security team
+""" Wrapper for Debian Security team """
# Copyright (C) 2006 Anthony Towns <ajt@debian.org>
# This program is free software; you can redistribute it and/or modify
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):
ver, suite)
adv += "%s\n%s\n\n" % (suite_header, "-"*len(suite_header))
- arches = Cnf.ValueList("Suite::%s::Architectures" % suite)
+ arches = database.get_suite_architectures(suite)
if "source" in arches:
arches.remove("source")
if "all" in arches:
print "Updating file lists for apt-ftparchive..."
spawn("dak make-suite-file-list")
print "Updating Packages and Sources files..."
+ spawn("/org/security.debian.org/dak/config/debian-security/map.sh")
spawn("apt-ftparchive generate %s" % (utils.which_apt_conf_file()))
print "Updating Release files..."
spawn("dak generate-releases")