X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdatabase.py;h=5c3626046446b9ccb5746b8edf0f6a9aae721f00;hb=536cb00b606a8581a76b66f55a58eabdf9f7fd3d;hp=d9fdc850c745ac234004fc94c6b643e3cbddc661;hpb=a29878d1b68545cac92669617f94c81330ee4fc7;p=dak.git diff --git a/daklib/database.py b/daklib/database.py index d9fdc850..5c362604 100755 --- a/daklib/database.py +++ b/daklib/database.py @@ -41,7 +41,7 @@ maintainer_cache = {} fingerprint_id_cache = {} queue_id_cache = {} uid_id_cache = {} -testing_version_cache = {} +suite_version_cache = {} ################################################################################ @@ -224,25 +224,26 @@ def get_source_id (source, version): return source_id -def get_testing_version(source): - global testing_version_cache +def get_suite_version(source, suite): + global suite_version_cache + cache_key = "%s_%s" % (source, suite) - if testing_version_cache.has_key(source): - return testing_version_cache[source] + if suite_version_cache.has_key(cache_key): + return suite_version_cache[cache_key] q = projectB.query(""" SELECT s.version FROM source s, suite su, src_associations sa WHERE sa.source=s.id AND sa.suite=su.id - AND su.suite_name='testing' + AND su.suite_name='%s' AND s.source='%s'""" - % (source)) + % (suite, source)) if not q.getresult(): return None version = q.getresult()[0][0] - testing_version_cache[source] = version + suite_version_cache[cache_key] = version return version