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

Fix verbs support in V2

Browse source
This commit is contained in:
Joseph Schorr 2015-08-18 11:53:48 -04:00
parent cf030e2a98
commit 1450b7e84c
9 changed files with 64 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
endpoints/v1/registry.py
View file

@ -168,7 +168,7 @@ def put_image_layer(namespace, repository, image_id):
repo_image = model.image.get_repo_image_extended(namespace, repository, image_id)
try:
logger.debug('Retrieving image data')
json_data = model.image.get_image_json(repo_image, store)
json_data = model.image.get_image_json(repo_image)
except (IOError, AttributeError):
logger.exception('Exception when retrieving image data')
abort(404, 'Image %(image_id)s not found', issue='unknown-image',
@ -296,7 +296,7 @@ def put_image_checksum(namespace, repository, image_id):
abort(404, 'Image not found: %(image_id)s', issue='unknown-image', image_id=image_id)
logger.debug('Looking up repo layer data')
if not model.image.get_image_json(repo_image, store):
if not model.image.has_image_json(repo_image):
abort(404, 'Image not found: %(image_id)s', issue='unknown-image', image_id=image_id)
logger.debug('Marking image path')
@ -349,7 +349,7 @@ def get_image_json(namespace, repository, image_id, headers):
logger.debug('Looking up repo layer data')
try:
data = repo_image.get_image_json(repo_image, store)
data = repo_image.get_image_json(repo_image)
except (IOError, AttributeError):
flask_abort(404)
@ -463,7 +463,7 @@ def put_image_json(namespace, repository, image_id):
abort(400, 'Image %(image_id)s depends on non existing parent image %(parent_id)s',
issue='invalid-request', image_id=image_id, parent_id=parent_id)
if not image_is_uploading(repo_image) and model.image.get_image_json(repo_image, store):
if not image_is_uploading(repo_image) and model.image.has_image_json(repo_image):
exact_abort(409, 'Image already exists')
set_uploading_flag(repo_image, True)