From d466d5474f1b7a4abee0954bc27b67296fd7c76e Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Fri, 29 Jul 2011 12:44:53 +0100 Subject: [PATCH] Final queue.py Dir::Queue removals Signed-off-by: Mark Hymers --- daklib/queue.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daklib/queue.py b/daklib/queue.py index eea43f78..49b465d5 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -2809,10 +2809,10 @@ distribution.""" source_epochless_version = re_no_epoch.sub('', source_version) dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version) found = False - for q in ["Embargoed", "Unembargoed", "Newstage"]: - if cnf.has_key("Dir::Queue::%s" % (q)): - if os.path.exists(cnf["Dir::Queue::%s" % (q)] + '/' + dsc_filename): - found = True + for queue_name in ["embargoed", "unembargoed", "newstage"]: + queue = get_policy_queue(queue_name, session) + if queue and os.path.exists(os.path.join(queue.path, dsc_filename)): + found = True if not found: self.rejects.append("no source found for %s %s (%s)." % (source_package, source_version, f)) -- 2.39.5