Merge branch 'master' into redalert
This commit is contained in:
commit
7de1dd7dc0
11 changed files with 32 additions and 50 deletions
|
@ -1100,6 +1100,9 @@ def _get_repository_images_base(namespace_name, repository_name, query_modifier)
|
|||
# Make sure we're always retrieving the same image object.
|
||||
image = location.storage.image
|
||||
|
||||
# Set the storage to the one we got from the location, to prevent another query
|
||||
image.storage = location.storage
|
||||
|
||||
if not image.id in images:
|
||||
images[image.id] = image
|
||||
image.storage.locations = set()
|
||||
|
|
Reference in a new issue