from daklib import queue
from daklib import daklog
from daklib import utils
-from daklib.dbconn import DBConn, get_or_set_queue, get_suite_architectures
+from daklib.dbconn import DBConn, get_build_queue, get_suite_architectures
from daklib.regexes import re_taint_free
Cnf = None
svs = srcverarches.keys()
svs.sort()
for sv in svs:
- as = srcverarches[sv].keys()
- as.sort()
- print " %s (%s)" % (sv, ", ".join(as))
+ as_ = srcverarches[sv].keys()
+ as_.sort()
+ print " %s (%s)" % (sv, ", ".join(as_))
def prompt(opts, default):
p = ""
def do_Approve(): sudo("A", _do_Approve, True)
def _do_Approve():
# 1. dump advisory in drafts
- draft = "/org/security.debian.org/advisories/drafts/%s" % (advisory)
+ draft = "/org/security-master.debian.org/advisories/drafts/%s" % (advisory)
print "Advisory in %s" % (draft)
if not Options["No-Action"]:
adv_file = "./advisory.%s" % (advisory)
# 3. run dak make-suite-file-list / apt-ftparchve / dak generate-releases
print "Updating file lists for apt-ftparchive..."
spawn("dak make-suite-file-list")
+ spawn("dak generate-filelist")
print "Updating Packages and Sources files..."
- spawn("/org/security.debian.org/dak/config/debian-security/map.sh")
+ spawn("/org/security-master.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")
print "Triggering security mirrors..."
+ spawn("/org/security-master.debian.org/dak/config/debian-security/make-mirror.sh")
spawn("sudo -u archvsync -H /home/archvsync/signal_security")
# 4. chdir to done - do upload
session = DBConn().session()
dest = Cnf["Dir::Queue::Unembargoed"]
- emb_q = get_or_set_queue("embargoed", session)
- une_q = get_or_set_queue("unembargoed", session)
+ emb_q = get_build_queue("embargoed", session)
+ une_q = get_build_queue("unembargoed", session)
for c in changes:
print "Disembargoing %s" % (c)
os.unlink(f)
print "Updating buildd information..."
- spawn("/org/security.debian.org/dak/config/debian-security/cron.buildd")
+ spawn("/org/security-master.debian.org/dak/config/debian-security/cron.buildd")
adv_file = "./advisory.%s" % (advisory)
if os.path.exists(adv_file):