Merge pull request #823 from coreos-inc/phase3-11-07-2015

Phase3 11 07 2015
This commit is contained in:
Jake Moshenko 2015-11-11 14:22:19 -05:00
commit a1ccd860e7
3 changed files with 0 additions and 3 deletions

View file

@ -484,7 +484,6 @@ class EmailConfirmation(BaseModel):
class ImageStorage(BaseModel): class ImageStorage(BaseModel):
uuid = CharField(default=uuid_generator, index=True, unique=True) uuid = CharField(default=uuid_generator, index=True, unique=True)
checksum = CharField(null=True) # TODO remove when all checksums have been moved back to Image
image_size = BigIntegerField(null=True) image_size = BigIntegerField(null=True)
uncompressed_size = BigIntegerField(null=True) uncompressed_size = BigIntegerField(null=True)
uploading = BooleanField(default=True, null=True) uploading = BooleanField(default=True, null=True)

View file

@ -301,7 +301,6 @@ def set_image_metadata(docker_image_id, namespace_name, repository_name, created
# We cleanup any old checksum in case it's a retry after a fail # We cleanup any old checksum in case it's a retry after a fail
fetched.v1_checksum = None fetched.v1_checksum = None
fetched.storage.checksum = None # TODO remove when storage checksums are no longer read
fetched.storage.content_checksum = None fetched.storage.content_checksum = None
fetched.comment = comment fetched.comment = comment

View file

@ -441,7 +441,6 @@ def store_checksum(image_with_storage, checksum, content_checksum):
return 'Invalid checksum format' return 'Invalid checksum format'
# We store the checksum # We store the checksum
image_with_storage.storage.checksum = checksum # TODO remove when v1 checksums are on image only
image_with_storage.storage.content_checksum = content_checksum image_with_storage.storage.content_checksum = content_checksum
image_with_storage.storage.save() image_with_storage.storage.save()