Merge remote-tracking branch 'origin/master' into allyourbaseimage

This commit is contained in:
jakedt 2014-02-17 15:18:01 -05:00
commit 46de02a9ec
13 changed files with 882 additions and 216 deletions

View file

@ -770,6 +770,16 @@ def get_all_repo_users(namespace_name, repository_name):
Repository.name == repository_name)
def get_repository_for_resource(resource_key):
joined = Repository.select().join(RepositoryBuild)
query = joined.where(RepositoryBuild.resource_key == resource_key).limit(1)
result = list(query)
if not result:
return None
return result[0]
def get_repository(namespace_name, repository_name):
try:
return Repository.get(Repository.name == repository_name,