From: Joerg Jaspert Date: Sun, 27 Nov 2011 22:42:31 +0000 (+0100) Subject: Merge remote-tracking branch 'drkranz/p-u' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=070544a0752f0b4a0d3513eadea3cb3a80eda683;hp=031b25dd5d828d29d268b773564886460fc8dca7;p=dak.git Merge remote-tracking branch 'drkranz/p-u' into merge * drkranz/p-u: Check whether suite is valid before referencing it (Closes: #634716) Signed-off-by: Joerg Jaspert --- diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 4a45ae2e..8c5806aa 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -2556,11 +2556,12 @@ def source_exists(source, source_version, suites = ["any"], session=None): if suite != "any": # source must exist in 'suite' or a suite that is enhanced by 'suite' s = get_suite(suite, session) - enhances_vcs = session.query(VersionCheck).filter(VersionCheck.suite==s).filter_by(check='Enhances') - considered_suites = [ vc.reference for vc in enhances_vcs ] - considered_suites.append(s) + if s: + enhances_vcs = session.query(VersionCheck).filter(VersionCheck.suite==s).filter_by(check='Enhances') + considered_suites = [ vc.reference for vc in enhances_vcs ] + considered_suites.append(s) - q = q.filter(DBSource.suites.any(Suite.suite_id.in_([s.suite_id for s in considered_suites]))) + q = q.filter(DBSource.suites.any(Suite.suite_id.in_([s.suite_id for s in considered_suites]))) if q.count() > 0: continue