StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sort content of merged target files package.

Browse Source 
By sorting the content of the final output merged target files package, the
merged target files package is more like the target files packages generated by
a build.

Test: Generate merged target files package, verify that content is sorted.
Change-Id: Ic0c198630ebd7692a3f3f9663d85e4b45229175c
This commit is contained in:
Bill Peckham
2019-04-24 17:59:01 -07:00
parent 74a679d963
commit 9662cfb234
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/releasetools/merge_target_files.py
View File

@@ -722,18 +722,21 @@ def merge_target_files(temp_dir, system_target_files, system_item_list,
output_target_files_meta_dir = os.path.join(output_target_files_temp_dir,
'META')
command = [
find_command = [
'find',
output_target_files_meta_dir,
]
# TODO(bpeckham): sort this to be more like build.
meta_content = common.RunAndCheckOutput(command, verbose=False)
command = [
find_process = common.Run(find_command, stdout=subprocess.PIPE, verbose=False)
meta_content = common.RunAndCheckOutput(['sort'], stdin=find_process.stdout,
verbose=False)
find_command = [
'find', output_target_files_temp_dir, '-path',
output_target_files_meta_dir, '-prune', '-o', '-print'
]
# TODO(bpeckham): sort this to be more like build.
other_content = common.RunAndCheckOutput(command, verbose=False)
find_process = common.Run(find_command, stdout=subprocess.PIPE, verbose=False)
other_content = common.RunAndCheckOutput(['sort'], stdin=find_process.stdout,
verbose=False)
with open(output_target_files_list, 'wb') as f:
f.write(meta_content)