X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=d39f8c582903b553d689da9bf508fa6104b5a729;hb=24dc52e8ca3a308111b7f41b0b2065ec0a103c7a;hp=c6612b72519235bd06df3fd6eeb663b93b8a8308;hpb=990fa476b62675b41eb77dcfa3041d875e2630b4;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index c6612b72..d39f8c58 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -2872,6 +2872,12 @@ class Suite(ORMObject): return session.query(DBSource).filter_by(source = source). \ with_parent(self) + def get_overridesuite(self): + if self.overridesuite is None: + return self + else: + return object_session(self).query(Suite).filter_by(suite_name=self.overridesuite).one() + __all__.append('Suite') @session_wrapper @@ -3147,7 +3153,9 @@ __all__.append('VersionCheck') def get_version_checks(suite_name, check = None, session = None): suite = get_suite(suite_name, session) if not suite: - return None + # Make sure that what we return is iterable so that list comprehensions + # involving this don't cause a traceback + return [] q = session.query(VersionCheck).filter_by(suite=suite) if check: q = q.filter_by(check=check)