mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 14:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

cgpt: fix up "with open" handling

Browse Source 
There is no need to call .close() ourself in a with block.

We can also use a with block in the WritePartitionScript func.

BUG=None
TEST=build_image still works

Change-Id: I53b31ba96c94e885b1d4415889b5d2a9691ccda1
Reviewed-on: https://gerrit.chromium.org/gerrit/34707
Reviewed-by: Liam McLoughlin <lmcloughlin@chromium.org>
Tested-by: Liam McLoughlin <lmcloughlin@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-10-04 17:25:57 -04:00 committed by Gerrit
parent 624071a08b
commit c17cf6aff0
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build_library/cgpt.py
View File

@ -32,7 +32,6 @@ def LoadPartitionConfig(filename):
raise ConfigNotFound('Partition config %s was not found!' % filename)
with open(filename) as f:
config = json.load(f)
f.close()
metadata = config['metadata']
metadata['block_size'] = int(metadata['block_size'])
@ -126,7 +125,6 @@ def GetScriptShell():
script_shell_path = os.path.join(os.path.dirname(__file__), 'cgpt_shell.sh')
with open(script_shell_path, 'r') as f:
script_shell = "".join(f.readlines())
f.close()
# Before we return, insert the path to this tool so somebody reading the
# script later can tell where it was generated.
@ -222,14 +220,12 @@ def WritePartitionScript(image_type, layout_filename, sfilename):
config = LoadPartitionConfig(layout_filename)
sfile = open(sfilename, 'w')
script_shell = GetScriptShell()
sfile.write(script_shell)
with open(sfilename, 'w') as f:
script_shell = GetScriptShell()
f.write(script_shell)
WriteLayoutFunction(sfile, 'write_base_table', 'base', config)
WriteLayoutFunction(sfile, 'write_partition_table', image_type, config)
sfile.close()
WriteLayoutFunction(f, 'write_base_table', 'base', config)
WriteLayoutFunction(f, 'write_partition_table', image_type, config)
def GetBlockSize(layout_filename):