Merge branch 'master' of bitbucket.org:yackob03/quay

This commit is contained in:
yackob03 2014-01-30 19:07:22 -05:00
commit f840592b6e

View file

@ -2,7 +2,7 @@ import logging
import json
from flask import (make_response, request, session, Response, redirect,
Blueprint)
Blueprint, abort as flask_abort)
from functools import wraps
from datetime import datetime
from time import time
@ -242,7 +242,7 @@ def get_image_json(namespace, repository, image_id, headers):
data = store.get_content(store.image_json_path(namespace, repository,
image_id))
except IOError:
abort(404, 'Image %(image_id)%s not found', issue='unknown-image', image_id=image_id)
flask_abort(404)
try:
size = store.get_size(store.image_layer_path(namespace, repository,