Merge remote-tracking branch 'origin/master' into rustedbuilds

This commit is contained in:
jakedt 2014-02-25 17:00:38 -05:00
commit de49ce151b
14 changed files with 124 additions and 50 deletions

View file

@ -67,7 +67,8 @@ def __create_subtree(repo, structure, creator_username, parent):
logger.debug('new docker id: %s' % docker_image_id)
checksum = __gen_checksum(docker_image_id)
new_image = model.create_or_link_image(docker_image_id, repo, None, {}, {})
new_image = model.find_create_or_link_image(docker_image_id, repo, None,
{})
new_image.storage.uuid = IMAGE_UUIDS[image_num % len(IMAGE_UUIDS)]
new_image.storage.save()