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

Change an ancestry error into a 404

Browse source
This commit is contained in:
Joseph Schorr 2014-08-18 13:35:03 -04:00
parent 9c560e8d7f
commit 1460879169
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
endpoints/registry.py
View file

@ -370,6 +370,7 @@ def generate_ancestry(image_id, uuid, locations, parent_id=None, parent_uuid=Non
if not parent_id: if not parent_id:
store.put_content(locations, store.image_ancestry_path(uuid), json.dumps([image_id])) store.put_content(locations, store.image_ancestry_path(uuid), json.dumps([image_id]))
return return
data = store.get_content(parent_locations, store.image_ancestry_path(parent_uuid)) data = store.get_content(parent_locations, store.image_ancestry_path(parent_uuid))
data = json.loads(data) data = json.loads(data)
data.insert(0, image_id) data.insert(0, image_id)
@ -470,8 +471,13 @@ def put_image_json(namespace, repository, image_id):
store.put_content(repo_image.storage.locations, json_path, request.data) store.put_content(repo_image.storage.locations, json_path, request.data)
profile.debug('Generating image ancestry') profile.debug('Generating image ancestry')
generate_ancestry(image_id, uuid, repo_image.storage.locations, parent_id, parent_uuid,
parent_locations) try:
generate_ancestry(image_id, uuid, repo_image.storage.locations, parent_id, parent_uuid,
parent_locations)
except IOError as ioe:
profile.debug('Error when generating ancestry: %s' % ioe.message)
abort(404)
profile.debug('Done') profile.debug('Done')
return make_response('true', 200) return make_response('true', 200)