From: Mark Hymers Date: Fri, 29 Jul 2011 10:33:42 +0000 (+0100) Subject: Convert from Dir::Queue references to db X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=sidebyside;h=48a259ec0c795a5f00c7115fa811ce3bc176b6c8;p=dak.git Convert from Dir::Queue references to db Signed-off-by: Mark Hymers --- diff --git a/daklib/queue.py b/daklib/queue.py index 4f52ea82..b784b114 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1055,10 +1055,11 @@ class Upload(object): for f, entry in self.pkg.files.items(): # Ensure the file does not already exist in one of the accepted directories - for d in [ "Byhand", "New", "ProposedUpdates", "OldProposedUpdates", "Embargoed", "Unembargoed" ]: - if not cnf.has_key("Dir::Queue::%s" % (d)): continue - if os.path.exists(os.path.join(cnf["Dir::Queue::%s" % (d) ], f)): - self.rejects.append("%s file already exists in the %s directory." % (f, d)) + # TODO: Dynamically generate this list + for queue_name in [ "byhand", "new", "proposedupdates", "oldproposedupdates", "embargoed", "unembargoed" ]: + queue = get_policy_queue(queue_name, session) + if queue and os.path.exists(queue.path, f)): + self.rejects.append("%s file already exists in the %s queue." % (f, queue_name)) if not re_taint_free.match(f): self.rejects.append("!!WARNING!! tainted filename: '%s'." % (f))