vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bug fixes and associated changes involved with spinning up build nodes and sending jobs to them.

Browse source
This commit is contained in:
yackob03 2013-10-27 19:06:20 -04:00
parent 3026f83c2c
commit d7f51fb764
5 changed files with 169 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/model.py
View file

@ -556,7 +556,7 @@ def load_token_data(code):
def get_repository_build(request_dbid):
try:
return RepositoryBuild.get(RepositoryBuild == request_dbid)
return RepositoryBuild.get(RepositoryBuild.id == request_dbid)
except RepositoryBuild.DoesNotExist:
msg = 'Unable to locate a build by id: %s' % request_dbid
raise InvalidRepositoryBuildException(msg)

5
data/userfiles.py
View file

@ -20,9 +20,8 @@ class S3FileWriteException(Exception):
class UserRequestFiles(object):
def __init__(self, s3_access_key, s3_secret_key, bucket_name):
self._s3_conn = boto.s3.connection.S3Connection(s3_access_key,
s3_secret_key,
is_secure=False)
self._s3_conn = boto.connect_s3(s3_access_key, s3_secret_key,
is_secure=False)
self._bucket_name = bucket_name
self._bucket = self._s3_conn.get_bucket(bucket_name)
self._access_key = s3_access_key