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 <mhy@debian.org>

diff --git a/ChangeLog b/ChangeLog
index f83eb3e7ae67976b8b20a076bee5e29f010307ec..6d8284a50cb06b851faf9ebaa974ed5e1ddd6903 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-27  Mark Hymers  <mhy@debian.org>
+
+       * 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  <joerg@debian.org>
 
        * dak/process_unchecked.py (queue_(un)embargo): (Hopefully) enable

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 99dae8c18f0f6afdc001f6693a457aa644275d57..ce6543d78590e57f927bd74e81eaffa04fadef1d 100755 (executable)
--- 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