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

Fix another image storage test. Reverse a test to make the conditional smaller.

Browse source
This commit is contained in:
jakedt 2014-02-17 14:58:45 -05:00
parent 369417c3ad
commit 50d130f199
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
data/model.py
View file

@ -925,7 +925,7 @@ def set_image_size(docker_image_id, namespace_name, repository_name,
except Image.DoesNotExist: except Image.DoesNotExist:
raise DataModelException('No image with specified id and repository') raise DataModelException('No image with specified id and repository')
if image.storage: if image.storage and image.storage.id:
image.storage.image_size = image_size image.storage.image_size = image_size
image.storage.save() image.storage.save()
else: else:
@ -1012,15 +1012,15 @@ def garbage_collect_repository(namespace_name, repository_name):
for image_id_to_remove in to_remove: for image_id_to_remove in to_remove:
image_to_remove = all_images[image_id_to_remove] image_to_remove = all_images[image_id_to_remove]
if not image_to_remove.storage or not image_to_remove.storage.id: if image_to_remove.storage and image_to_remove.storage.id:
logger.debug('Adding image storage to the gc list: %s',
image_to_remove.storage.uuid)
uuids_to_check_for_gc.add(image_to_remove.storage.uuid)
else:
image_path = store.image_path(namespace_name, repository_name, image_path = store.image_path(namespace_name, repository_name,
image_to_remove.docker_image_id, None) image_to_remove.docker_image_id, None)
logger.debug('Deleting image storage: %s', image_path) logger.debug('Deleting image storage: %s', image_path)
store.remove(image_path) store.remove(image_path)
else:
logger.debug('Adding image storage to the gc list: %s',
image_to_remove.storage.uuid)
uuids_to_check_for_gc.add(image_to_remove.storage.uuid)
image_to_remove.delete_instance() image_to_remove.delete_instance()