From: Mark Hymers Date: Thu, 27 Nov 2008 14:51:32 +0000 (+0000) Subject: dak/new_security_install.py: Attempt to tidy up the buildd queue. X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=86cfb58e1ef3bb3fbc4b4ff82f719967c6e3f4b0 dak/new_security_install.py: Attempt to tidy up the buildd queue. The buildd team believes that the fact that the packages are in the security pool after this point should be good enough. Signed-off-by: Mark Hymers --- diff --git a/ChangeLog b/ChangeLog index f83eb3e7..6d8284a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-27 Mark Hymers + + * dak/new_security_install.py: Attempt to tidy up the buildd queue. The + buildd team believes that the fact that the packages are in the security + pool after this point should be good enough. + 2008-11-25 Joerg Jaspert * dak/process_unchecked.py (queue_(un)embargo): (Hopefully) enable diff --git a/dak/new_security_install.py b/dak/new_security_install.py index 99dae8c1..ce6543d7 100755 --- a/dak/new_security_install.py +++ b/dak/new_security_install.py @@ -282,6 +282,7 @@ def actually_upload(changes_files): print "Moving files to UploadQueue" for filename in uploads[uri]: utils.copy(filename, Cnf["Dir::Upload"]) + remove_from_buildd(suites, filename) #spawn("lftp -c 'open %s; cd %s; put %s'" % (host, path, file_list)) if not Options["No-Action"]: @@ -292,6 +293,17 @@ def actually_upload(changes_files): file.write(" ".join([source, version])+'\n') file.close() +def remove_from_buildd(suites, filename): + """Check the buildd dir for each suite and remove the file if needed""" + builddbase = Cnf["Dir::QueueBuild"] + filebase = os.path.basename(filename) + for s in suites: + 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))) + + def generate_advisory(template): global changes, advisory