Merge branch 'psycopg2' into content_generation

[dak.git] / dak / new_security_install.py

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index ce6543d78590e57f927bd74e81eaffa04fadef1d..b1a47dba8f2527bbe733afea5f014f064acf4634 100755 (executable)
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
 #!/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
 # Copyright (C) 2006  Anthony Towns <ajt@debian.org>
 
 # This program is free software; you can redistribute it and/or modify


@@ -20,13 +20,13 @@
 
 ################################################################################
 
 
 ################################################################################
 

+import apt_pkg, os, sys, pwd, time, commands
+

 from daklib import queue
 from daklib import logging
 from daklib import utils
 from daklib import database
 from daklib import queue
 from daklib import logging
 from daklib import utils
 from daklib import database

-import apt_pkg, os, sys, pwd, time, re, commands
-
-re_taint_free = re.compile(r"^['/;\-\+\.~\s\w]+$");
+from daklib.regexes import re_taint_free

 
 Cnf = None
 Options = None
 
 Cnf = None
 Options = None


@@ -282,7 +282,9 @@ def actually_upload(changes_files):
         print "Moving files to UploadQueue"
         for filename in uploads[uri]:
             utils.copy(filename, Cnf["Dir::Upload"])
         print "Moving files to UploadQueue"
         for filename in uploads[uri]:
             utils.copy(filename, Cnf["Dir::Upload"])

-            remove_from_buildd(suites, filename)
+            # .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"]:
         #spawn("lftp -c 'open %s; cd %s; put %s'" % (host, path, file_list))
 
     if not Options["No-Action"]: