let's be a bit more clever about this

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index ceb4a797863b626565febb7a9553293f131232b8..fa1c809ea0a70b7821b6defa8beab41c8492e576 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1292,7 +1292,7 @@ SELECT s.version, su.suite_name FROM source s, src_associations sa, suite su
                     if os.path.exists(in_unchecked) and False:
                         return (self.reject_message, in_unchecked)
                     else:
-                        for directory in [ "Accepted", "New", "Byhand", "ProposedUpdates", "OldProposedUpdates" ]:
+                        for directory in [ "Accepted", "New", "Byhand", "ProposedUpdates", "OldProposedUpdates", "Embargoed", "Unembargoed" ]:
                             in_otherdir = os.path.join(self.Cnf["Dir::Queue::%s" % (directory)],dsc_file)
                             if os.path.exists(in_otherdir):
                                 in_otherdir_fh = utils.open_file(in_otherdir)
@@ -1315,21 +1315,3 @@ SELECT s.version, su.suite_name FROM source s, src_associations sa, suite su
                 self.reject("size for %s doesn't match %s." % (found, file))
 
         return (self.reject_message, None)
-
-    def do_query(self, query):
-        """
-        Executes a database query. Writes statistics / timing to stderr.
-
-        @type query: string
-        @param query: database query string, passed unmodified
-
-        @return: db result
-
-        @warning: The query is passed B{unmodified}, so be careful what you use this for.
-        """
-        sys.stderr.write("query: \"%s\" ... " % (query))
-        before = time.time()
-        r = self.projectB.query(query)
-        time_diff = time.time()-before
-        sys.stderr.write("took %.3f seconds.\n" % (time_diff))
-        return r