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

Strip whitespace from ALL the things.

Browse source
This commit is contained in:
Jimmy Zelinskie 2014-11-24 16:07:38 -05:00
parent f6dd8b0a4d
commit 716d7a737b
171 changed files with 807 additions and 807 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/dockerloadformat.py
View file

@ -33,7 +33,7 @@ def _import_format_generator(namespace, repository, tag, synthetic_image_id,
# layer.tar - The TARed contents of the layer
# VERSION - The docker import version: '1.0'
layer_merger = StreamLayerMerger(get_layer_iterator)
# Yield the repositories file:
synthetic_layer_info = {}
synthetic_layer_info[tag + '.squash'] = synthetic_image_id
@ -68,7 +68,7 @@ def _import_format_generator(namespace, repository, tag, synthetic_image_id,
yielded_size += len(entry)
# If the yielded size is more than the estimated size (which is unlikely but possible), then
# raise an exception since the tar header will be wrong.
# raise an exception since the tar header will be wrong.
if yielded_size > estimated_file_size:
raise FileEstimationException()
@ -95,7 +95,7 @@ def _build_layer_json(layer_json, synthetic_image_id):
if 'parent' in updated_json:
del updated_json['parent']
if 'config' in updated_json and 'Image' in updated_json['config']:
updated_json['config']['Image'] = synthetic_image_id
@ -129,4 +129,4 @@ def _tar_file_header(name, file_size):
def _tar_folder(name):
info = tarfile.TarInfo(name=name)
info.type = tarfile.DIRTYPE
return info.tobuf()
return info.tobuf()