From: Mark Hymers <mhy@debian.org>
Date: Sat, 8 Nov 2014 15:35:34 +0000 (+0000)
Subject: Find suite by any of the random name types we have
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b8a54f3492341b5fe6d754374927cb52fb03ae49;hp=14ca1d5ed8b7ea783d57d76802d8cb93d7f2fabb;p=dak.git

Find suite by any of the random name types we have

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

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 535c7f8e..4d1035c2 100644
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2298,8 +2298,22 @@ def get_suite(suite, session=None):
     @return: Suite object for the requested suite name (None if not present)
     """
 
+    # Start by looking for the dak internal name
     q = session.query(Suite).filter_by(suite_name=suite)
+    try:
+        return q.one()
+    except NoResultFound:
+        pass
+
+    # Now try codename
+    q = session.query(Suite).filter_by(codename=suite)
+    try:
+        return q.one()
+    except NoResultFound:
+        pass
 
+    # Finally give release_suite a try
+    q = session.query(Suite).filter_by(release_suite=suite)
     try:
         return q.one()
     except NoResultFound: