X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fnew_security_install.py;h=856428e013cc5ea0f219f4cc9fcf6dcaa9288782;hb=2b4d5bf75e28a6b5fa5afbd58defdf661c893033;hp=99dae8c18f0f6afdc001f6693a457aa644275d57;hpb=3c2b932e8e034c8f314537231e14f62e7e61537c;p=dak.git

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 99dae8c1..856428e0 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -282,6 +282,9 @@ def actually_upload(changes_files):
         print "Moving files to UploadQueue"
         for filename in uploads[uri]:
             utils.copy(filename, Cnf["Dir::Upload"])
+            # .changes files have already been moved to queue/done by p-a
+            if not filename.endswith('.changes'):
+                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 +295,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