X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=a8ea3035df38102937f0f6b32720c5c43fa05272;hb=bdc4c1b3239f0630aaf79dec450ef71534bac8b9;hp=48d0fa3389b4a9c789a0920e495c8a344e6a3fab;hpb=8bc33f152f0b90e86abc53cb1b85a3acb6858e78;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
index 48d0fa33..a8ea3035 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -700,7 +700,7 @@ class Upload(object):
 
         # Ensure target distributions exist
         for suite in self.pkg.changes["distribution"].keys():
-            if not Cnf.has_key("Suite::%s" % (suite)):
+            if not get_suite(suite.lower()):
                 self.rejects.append("Unknown distribution `%s'." % (suite))
 
     ###########################################################################
@@ -961,8 +961,7 @@ class Upload(object):
                 entry["component"] = dest
 
         # Ensure the component is valid for the target suite
-        if cnf.has_key("Suite:%s::Components" % (suite)) and \
-           entry["component"] not in cnf.ValueList("Suite::%s::Components" % (suite)):
+        if entry["component"] not in get_component_names(session):
             self.rejects.append("unknown component `%s' for suite `%s'." % (entry["component"], suite))
             return
 
@@ -2174,7 +2173,7 @@ distribution."""
 
         # Move the .changes into the 'done' directory
         ye, mo, da = time.gmtime()[0:3]
-        donedir = os.path.join(cnf["Dir::Queue::Done"], str(ye), "%0.2d" % mo, "%0.2d" % da)
+        donedir = os.path.join(cnf["Dir::Done"], str(ye), "%0.2d" % mo, "%0.2d" % da)
         if not os.path.isdir(donedir):
             os.makedirs(donedir)