From: Mark Hymers <mhy@debian.org>
Date: Sat, 30 Jul 2011 09:34:32 +0000 (+0100)
Subject: Ensure we have a session so that we can look up srcformats
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96f9039e69c95c681e9e522bec91043a4a68999d;p=dak

Ensure we have a session so that we can look up srcformats

Signed-off-by: Mark Hymers <mhy@debian.org>
---

diff --git a/daklib/queue.py b/daklib/queue.py
index f912bef1..e12a9971 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1180,6 +1180,9 @@ class Upload(object):
         if not self.pkg.changes["architecture"].has_key("source"):
             return True
 
+        if session is None:
+            session = DBConn().session()
+
         (status, reason) = self.load_dsc(action=action)
         if not status:
             self.rejects.append(reason)
@@ -1217,7 +1220,11 @@ class Upload(object):
 
         # Only a limited list of source formats are allowed in each suite
         for dist in self.pkg.changes["distribution"].keys():
-            allowed = [ x.format_name for x in dist.srcformats ]
+            suite = get_suite(dist, session=session)
+            if not suite:
+                self.rejects.append("%s: cannot find suite %s when checking source formats" % (dsc_filename, dist))
+                continue
+            allowed = [ x.format_name for x in suite.srcformats ]
             if self.pkg.dsc["format"] not in allowed:
                 self.rejects.append("%s: source format '%s' not allowed in %s (accepted: %s) " % (dsc_filename, self.pkg.dsc["format"], dist, ", ".join(allowed)))