X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=daklib%2Fdbconn.py;h=3fab31bc2204c966f7f80edd47ef44b0ec0cc37e;hb=2a10967af5974e4fa513d029fb995e122d90501a;hp=535c7f8ecb9c749bc360ffbef35ba5efec58acf6;hpb=14ca1d5ed8b7ea783d57d76802d8cb93d7f2fabb;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 535c7f8e..3fab31bc 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: @@ -2637,6 +2651,7 @@ class DBConn(object): 'obsolete_any_associations', 'obsolete_any_by_all_associations', 'obsolete_src_associations', + 'package_list', 'source_suite', 'src_associations_bin', 'src_associations_src',